diff options
| author | cdumoulin | 2011-03-28 10:36:13 +0000 |
|---|---|---|
| committer | cdumoulin | 2011-03-28 10:36:13 +0000 |
| commit | 608ae9145a6ec16985b91d9e168e34354e325ac5 (patch) | |
| tree | 9fe6ddd4117f07bb413564e443a145d9e6b8d235 | |
| parent | f2602412ffa8d798ccfd79d4c7b51a4a35df3c57 (diff) | |
| download | org.eclipse.papyrus-608ae9145a6ec16985b91d9e168e34354e325ac5.tar.gz org.eclipse.papyrus-608ae9145a6ec16985b91d9e168e34354e325ac5.tar.xz org.eclipse.papyrus-608ae9145a6ec16985b91d9e168e34354e325ac5.zip | |
ASSIGNED - bug 340764: [Deployment Diagram] Papyrus Shall provide Deployment Diagram
https://bugs.eclipse.org/bugs/show_bug.cgi?id=340764
- Image are now created throw a Factory (oep.diagram.common.Activator). This allows to reuse them.
- Add missing/update files build.properties and about.html
6 files changed, 92 insertions, 11 deletions
diff --git a/incoming/org.eclipse.papyrus.diagram.component/about.html b/incoming/org.eclipse.papyrus.diagram.component/about.html new file mode 100644 index 00000000000..82d49bf5f81 --- /dev/null +++ b/incoming/org.eclipse.papyrus.diagram.component/about.html @@ -0,0 +1,28 @@ +<!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>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</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>
diff --git a/incoming/org.eclipse.papyrus.diagram.component/build.properties b/incoming/org.eclipse.papyrus.diagram.component/build.properties index 41eb6ade2b4..cf473991117 100644 --- a/incoming/org.eclipse.papyrus.diagram.component/build.properties +++ b/incoming/org.eclipse.papyrus.diagram.component/build.properties @@ -1,4 +1,15 @@ -source.. = src/
+bin.includes = .,\
+ icons/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ messages.properties,\
+ about.html
+jars.compile.order = .
+source.. = src/,\
+ custom-src/
output.. = bin/
-bin.includes = META-INF/,\
- .
+src.includes = about.html,\
+ model/,\
+ icons/,\
+ messages.properties
diff --git a/incoming/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/custom/figure/nodes/CompositeFigure.java b/incoming/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/custom/figure/nodes/CompositeFigure.java index 91733446e21..f9b664a2c32 100644 --- a/incoming/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/custom/figure/nodes/CompositeFigure.java +++ b/incoming/org.eclipse.papyrus.diagram.component/custom-src/org/eclipse/papyrus/diagram/component/custom/figure/nodes/CompositeFigure.java @@ -19,8 +19,10 @@ import java.util.List; import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.diagram.common.Activator;
import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;
import org.eclipse.papyrus.diagram.component.part.UMLDiagramEditorPlugin;
+import org.eclipse.swt.graphics.Image;
// TODO: Auto-generated Javadoc
/**
@@ -45,8 +47,8 @@ public class CompositeFigure extends CompartmentFigure { */
public CompositeFigure() {
super(COMPARTMENT, "component");
- ImageDescriptor IMG_DESC = UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/obj16/ComponentIcon.gif");
- setAppliedStereotypeIcon(IMG_DESC.createImage(), PositionConstants.RIGHT);
+ Image img = Activator.getPluginIconImage(UMLDiagramEditorPlugin.ID, "icons/obj16/ComponentIcon.gif");
+ setAppliedStereotypeIcon(img, PositionConstants.RIGHT);
}
/**
diff --git a/incoming/org.eclipse.papyrus.diagram.deployment/about.html b/incoming/org.eclipse.papyrus.diagram.deployment/about.html new file mode 100644 index 00000000000..82d49bf5f81 --- /dev/null +++ b/incoming/org.eclipse.papyrus.diagram.deployment/about.html @@ -0,0 +1,28 @@ +<!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>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</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>
diff --git a/incoming/org.eclipse.papyrus.diagram.deployment/build.properties b/incoming/org.eclipse.papyrus.diagram.deployment/build.properties index 94408cbfe89..cf473991117 100644 --- a/incoming/org.eclipse.papyrus.diagram.deployment/build.properties +++ b/incoming/org.eclipse.papyrus.diagram.deployment/build.properties @@ -1,5 +1,15 @@ -source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
+bin.includes = .,\
+ icons/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ messages.properties,\
+ about.html
jars.compile.order = .
+source.. = src/,\
+ custom-src/
+output.. = bin/
+src.includes = about.html,\
+ model/,\
+ icons/,\
+ messages.properties
diff --git a/incoming/org.eclipse.papyrus.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ArtifactFigure.java b/incoming/org.eclipse.papyrus.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ArtifactFigure.java index 12afb4e6102..e80224369c4 100644 --- a/incoming/org.eclipse.papyrus.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ArtifactFigure.java +++ b/incoming/org.eclipse.papyrus.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ArtifactFigure.java @@ -18,8 +18,10 @@ import java.util.List; import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.diagram.common.Activator;
import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;
import org.eclipse.papyrus.diagram.deployment.part.UMLDiagramEditorPlugin;
+import org.eclipse.swt.graphics.Image;
// TODO: Auto-generated Javadoc
@@ -56,8 +58,8 @@ public class ArtifactFigure extends CompartmentFigure { */
public ArtifactFigure(String tagvalue) {
super(COMPARTMENT, tagvalue);
- ImageDescriptor IMG_DESC = UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/obj16/ArtifactIcon.gif");
- setAppliedStereotypeIcon(IMG_DESC.createImage(), PositionConstants.RIGHT);
+ Image img = Activator.getPluginIconImage(UMLDiagramEditorPlugin.ID, "icons/obj16/ArtifactIcon.gif");
+ setAppliedStereotypeIcon(img, PositionConstants.RIGHT);
}
/**
|