Author: jsdelfino
Date: Thu May 15 14:05:50 2008
New Revision: 656836
URL: http://svn.apache.org/viewvc?rev=656836&view=rev
Log:
Minor changes to plugin to make it work with Eclipse 3.2 / OSGi 1.3 as well as
Eclipse 3.3 / OSGi 1.4.
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF?rev=656836&r1=656835&r2=656836&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
(original)
+++ incubator/tuscany/java/sca/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
Thu May 15 14:05:50 2008
@@ -25,7 +25,7 @@
org.eclipse.swt.widgets,
org.eclipse.ui,
org.eclipse.ui.progress,
- org.osgi.framework;version="1.4.0"
+ org.osgi.framework;version="1.3.0"
Bundle-Vendor: Apache Software Foundation
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.ui.ide
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java?rev=656836&r1=656835&r2=656836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
Thu May 15 14:05:50 2008
@@ -131,7 +131,7 @@
} catch (Exception e) {
Platform.getLog(
Platform.getBundle("org.apache.tuscany.sca.core")).log(
- new Status(IStatus.ERROR, "org.apache.tuscany.sca.core",
"Could not launch SCA composite", e));
+ new Status(IStatus.ERROR, "org.apache.tuscany.sca.core",
IStatus.OK, "Could not launch SCA composite", e));
}
}
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java?rev=656836&r1=656835&r2=656836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
Thu May 15 14:05:50 2008
@@ -44,60 +44,59 @@
* @version $Rev$ $Date$
*/
public class NewComponentTypeWizardPage extends WizardNewFileCreationPage {
-
- private IWorkbench workbench;
+
+ private IWorkbench workbench;
- public NewComponentTypeWizardPage(IWorkbench workbench,
IStructuredSelection selection) {
- super("New SCA ComponentType Page", selection);
-
- this.workbench = workbench;
-
- setTitle("SCA ComponentType");
- setDescription("Create a new SCA ComponentType.");
-
- try {
- String location =
FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.core").getEntry("/")).getFile().toString();
-
setImageDescriptor(ImageDescriptor.createFromImageData((new
ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
- } catch (Exception e) {
+ public NewComponentTypeWizardPage(IWorkbench workbench,
IStructuredSelection selection) {
+ super("New SCA ComponentType Page", selection);
+
+ this.workbench = workbench;
+
+ setTitle("SCA ComponentType");
+ setDescription("Create a new SCA ComponentType.");
+
+ try {
+ String location =
FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.core").getEntry("/")).getFile().toString();
+
setImageDescriptor(ImageDescriptor.createFromImageData((new
ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
+ } catch (Exception e) {
Platform.getLog(
Platform.getBundle("org.apache.tuscany.sca.core")).log(
- new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", "Could not create wizard", e));
- }
-
- setFileExtension("componentType");
- setFileName("sample.componentType");
-
- }
-
- public boolean finish() {
- try {
- IFile file = createNewFile();
-
+ new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", IStatus.OK, "Could not create wizard", e));
+ }
+
+ setFileName("sample.componentType");
+
+ }
+
+ public boolean finish() {
+ try {
+ IFile file = createNewFile();
+
IWorkbenchWindow workbenchWindow =
workbench.getActiveWorkbenchWindow();
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- IDE.openEditor(workbenchPage, file, true);
- } catch (Exception e) {
+ IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
+ IDE.openEditor(workbenchPage, file, true);
+ } catch (Exception e) {
Platform.getLog(
Platform.getBundle("org.apache.tuscany.sca.core")).log(
- new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", "Could not open editor", e));
- return false;
- }
- return true;
- }
+ new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", IStatus.OK, "Could not open editor", e));
+ return false;
+ }
+ return true;
+ }
- @Override
- protected InputStream getInitialContents() {
-
- ByteArrayOutputStream outputStream = new
ByteArrayOutputStream();
- PrintWriter printWriter = new PrintWriter(outputStream);
- printWriter.println("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
- printWriter.println("<componentType
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"";);
- printWriter.println("
xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\";>");
- printWriter.println();
- printWriter.println();
- printWriter.println("</componentType>");
- printWriter.close();
-
- return new ByteArrayInputStream(outputStream.toByteArray());
- }
+ @Override
+ protected InputStream getInitialContents() {
+
+ ByteArrayOutputStream outputStream = new
ByteArrayOutputStream();
+ PrintWriter printWriter = new PrintWriter(outputStream);
+ printWriter.println("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
+ printWriter.println("<componentType
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"";);
+ printWriter.println("
xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\";>");
+ printWriter.println();
+ printWriter.println();
+ printWriter.println("</componentType>");
+ printWriter.close();
+
+ return new ByteArrayInputStream(outputStream.toByteArray());
+ }
}
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java?rev=656836&r1=656835&r2=656836&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
Thu May 15 14:05:50 2008
@@ -46,65 +46,64 @@
* @version $Rev$ $Date$
*/
public class NewCompositeWizardPage extends WizardNewFileCreationPage {
-
- private IWorkbench workbench;
+
+ private IWorkbench workbench;
- public NewCompositeWizardPage(IWorkbench workbench,
IStructuredSelection selection) {
- super("New SCA Composite Page", selection);
-
- this.workbench = workbench;
-
- setTitle("SCA Composite");
- setDescription("Create a new SCA Composite.");
-
- try {
- String location =
FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.core").getEntry("/")).getFile().toString();
-
setImageDescriptor(ImageDescriptor.createFromImageData((new
ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
- } catch (Exception e) {
- Platform.getLog(
-
Platform.getBundle("org.apache.tuscany.sca.core")).log(
- new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", "Could not create wizard", e));
- }
-
- setFileExtension("composite");
- setFileName("sample.composite");
-
- }
-
- public boolean finish() {
- try {
- IFile file = createNewFile();
-
+ public NewCompositeWizardPage(IWorkbench workbench,
IStructuredSelection selection) {
+ super("New SCA Composite Page", selection);
+
+ this.workbench = workbench;
+
+ setTitle("SCA Composite");
+ setDescription("Create a new SCA Composite.");
+
+ try {
+ String location =
FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.core").getEntry("/")).getFile().toString();
+
setImageDescriptor(ImageDescriptor.createFromImageData((new
ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
+ } catch (Exception e) {
+ Platform.getLog(
+
Platform.getBundle("org.apache.tuscany.sca.core")).log(
+ new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", IStatus.OK, "Could not create wizard", e));
+ }
+
+ setFileName("sample.composite");
+
+ }
+
+ public boolean finish() {
+ try {
+ IFile file = createNewFile();
+
IWorkbenchWindow workbenchWindow =
workbench.getActiveWorkbenchWindow();
- IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
- IDE.openEditor(workbenchPage, file, true);
- } catch (Exception e) {
+ IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
+ IDE.openEditor(workbenchPage, file, true);
+ } catch (Exception e) {
Platform.getLog(
Platform.getBundle("org.apache.tuscany.sca.core")).log(
- new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", "Could not open editor", e));
- return false;
- }
- return true;
- }
+ new Status(IStatus.ERROR,
"org.apache.tuscany.sca.core", IStatus.OK, "Could not open editor", e));
+ return false;
+ }
+ return true;
+ }
- @Override
- protected InputStream getInitialContents() {
+ @Override
+ protected InputStream getInitialContents() {
- IPath path = new Path(getFileName());
- String name = path.removeFileExtension().toString();
- ByteArrayOutputStream outputStream = new
ByteArrayOutputStream();
- PrintWriter printWriter = new PrintWriter(outputStream);
- printWriter.println("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
- printWriter.println("<composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"";);
- printWriter.println("
xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\"";);
- printWriter.println(" xmlns:c=\"http://"; + name + "\"");
+ IPath path = new Path(getFileName());
+ String name = path.removeFileExtension().toString();
+ ByteArrayOutputStream outputStream = new
ByteArrayOutputStream();
+ PrintWriter printWriter = new PrintWriter(outputStream);
+ printWriter.println("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
+ printWriter.println("<composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"";);
+ printWriter.println("
xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\"";);
+ printWriter.println(" xmlns:c=\"http://"; + name + "\"");
printWriter.println(" targetNamespace=\"http://"; + name +
"\"");
- printWriter.println(" name=\"" + name + "\">");
- printWriter.println();
+ printWriter.println(" name=\"" + name + "\">");
+ printWriter.println();
printWriter.println();
- printWriter.println("</composite>");
- printWriter.close();
-
- return new ByteArrayInputStream(outputStream.toByteArray());
- }
+ printWriter.println("</composite>");
+ printWriter.close();
+
+ return new ByteArrayInputStream(outputStream.toByteArray());
+ }
}
