Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbridgha2005-10-03 16:01:31 +0000
committercbridgha2005-10-03 16:01:31 +0000
commite6d9d8091f9f5f805ea44ed62d830d064d4f2771 (patch)
tree9eb4e9088026fccce4a6bc34c80bf6fbb8828882
parentac412156bc90d0ad8bd5bef05d1c1f02b45af169 (diff)
downloadwebtools.javaee-e6d9d8091f9f5f805ea44ed62d830d064d4f2771.tar.gz
webtools.javaee-e6d9d8091f9f5f805ea44ed62d830d064d4f2771.tar.xz
webtools.javaee-e6d9d8091f9f5f805ea44ed62d830d064d4f2771.zip
[108681] Changes for Single component
Diffstat
-rw-r--r--plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java2
-rw-r--r--plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java2
-rw-r--r--plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java2
-rw-r--r--plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java2
-rw-r--r--plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java6
-rw-r--r--plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java6
-rw-r--r--plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java2
7 files changed, 11 insertions, 11 deletions
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
index 1c977be2b..9286c9527 100644
--- 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
@@ -379,7 +379,7 @@ public class ConnectorArtifactEdit extends EnterpriseArtifactEdit implements IAr
public Archive asArchive(boolean includeSource) throws OpenFailureException{
ConnectorComponentLoadStrategyImpl loader = new ConnectorComponentLoadStrategyImpl(getComponent());
loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getProject());
+ String uri = ModuleURIUtil.getHandleString(getComponent());
return CommonarchiveFactory.eINSTANCE.openRARFile(loader, uri);
}
}
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
index 93730af54..630b2b8f6 100644
--- 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
@@ -301,7 +301,7 @@ public class WebLibDependencyPropertiesPage extends JARDependencyPropertiesPage
private ClasspathElement createClassPathElement(IVirtualComponent archiveComp,
String unresolvedName ) {
- URI uri = URI.createURI(ModuleURIUtil.getHandleString(archiveComp.getProject()));
+ URI uri = URI.createURI(ModuleURIUtil.getHandleString(archiveComp));
ClasspathElement element = new ClasspathElement(uri);
element.setValid(false);
element.setSelected(true);
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
index c1ce736cf..363980685 100644
--- 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
@@ -597,7 +597,7 @@ public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
public Archive asArchive(boolean includeSource) throws OpenFailureException{
WebComponentLoadStrategyImpl loader = new WebComponentLoadStrategyImpl(getComponent());
loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getProject());
+ String uri = ModuleURIUtil.getHandleString(getComponent());
return CommonarchiveFactory.eINSTANCE.openWARFile(loader, uri);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
index f65bedcff..bc5412b9f 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
@@ -357,7 +357,7 @@ public class AppClientArtifactEdit extends EnterpriseArtifactEdit implements IAr
public Archive asArchive(boolean includeSource) throws OpenFailureException{
AppClientComponentLoadStrategyImpl loader = new AppClientComponentLoadStrategyImpl(getComponent());
loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getProject());
+ String uri = ModuleURIUtil.getHandleString(getComponent());
return CommonarchiveFactory.eINSTANCE.openApplicationClientFile(loader, uri);
}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
index 5ec5046c4..b6428a64f 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
@@ -617,7 +617,7 @@ public class ClasspathModel implements ResourceStateInputProvider, ResourceState
//String uri = ComponentUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
String unresolvedURI = "";
try {
- unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent.getProject())));
+ unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)));
} catch (UnresolveableURIException e) {
e.printStackTrace();
}
@@ -635,12 +635,12 @@ public class ClasspathModel implements ResourceStateInputProvider, ResourceState
ClasspathElement element = null;
if( !alreadyInList ){
if( inClassPath(javaProject, archiveURI.lastSegment())){
- element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent.getProject())), archiveURI.lastSegment(), archiveURI.lastSegment());
+ element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), archiveURI.lastSegment());
classPathWLPSelection.addClasspathElement(element, unresolvedURI);
}
else
{
- element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent.getProject())), archiveURI.lastSegment(), null);
+ element = classPathWLPSelection.createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), null);
classPathWLPSelection.addClasspathElement(element, unresolvedURI);
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
index 91e9e7b62..5bd40c759 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
@@ -355,7 +355,7 @@ public class ClassPathSelection {
String uri = ComponentUtilities.getResolvedPathForArchiveComponent(referencedComponent.getName()).toString();
String unresolvedURI = "";
try {
- unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent.getProject())));
+ unresolvedURI = ModuleURIUtil.getArchiveName(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)));
} catch (UnresolveableURIException e) {
e.printStackTrace();
}
@@ -373,10 +373,10 @@ public class ClassPathSelection {
if( !alreadyInList ){
if( inManifest(cp, archiveURI.lastSegment())){
- element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent.getProject())), archiveURI.lastSegment(), archiveURI.lastSegment());
+ element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), archiveURI.lastSegment());
addClasspathElement(element, unresolvedURI);
}else{
- element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent.getProject())), archiveURI.lastSegment(), null);
+ element = createArchiveElement(URI.createURI(ModuleURIUtil.getHandleString(referencedComponent)), archiveURI.lastSegment(), null);
addClasspathElement(element, unresolvedURI);
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
index 909032b69..db44eb6b8 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
@@ -519,7 +519,7 @@ public class EARArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
public Archive asArchive(boolean includeSource) throws OpenFailureException {
EARComponentLoadStrategyImpl loader = new EARComponentLoadStrategyImpl(getComponent());
loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getProject());
+ String uri = ModuleURIUtil.getHandleString(getComponent());
return CommonarchiveFactory.eINSTANCE.openEARFile(loader, uri);
}

Back to the top