diff --git a/org.cloudsmith.graph.emf/.classpath b/com.puppetlabs.graph.emf/.classpath similarity index 100% rename from org.cloudsmith.graph.emf/.classpath rename to com.puppetlabs.graph.emf/.classpath diff --git a/org.cloudsmith.graph.emf/.gitignore b/com.puppetlabs.graph.emf/.gitignore similarity index 100% rename from org.cloudsmith.graph.emf/.gitignore rename to com.puppetlabs.graph.emf/.gitignore diff --git a/org.cloudsmith.graph.emf/.project b/com.puppetlabs.graph.emf/.project similarity index 94% rename from org.cloudsmith.graph.emf/.project rename to com.puppetlabs.graph.emf/.project index 263eed9..f4489cf 100644 --- a/org.cloudsmith.graph.emf/.project +++ b/com.puppetlabs.graph.emf/.project @@ -1,6 +1,6 @@ - org.cloudsmith.graph.emf + com.puppetlabs.graph.emf diff --git a/org.cloudsmith.graph.emf/.settings/org.eclipse.core.resources.prefs b/com.puppetlabs.graph.emf/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.cloudsmith.graph.emf/.settings/org.eclipse.core.resources.prefs rename to com.puppetlabs.graph.emf/.settings/org.eclipse.core.resources.prefs diff --git a/org.cloudsmith.graph.emf/.settings/org.eclipse.jdt.core.prefs b/com.puppetlabs.graph.emf/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.cloudsmith.graph.emf/.settings/org.eclipse.jdt.core.prefs rename to com.puppetlabs.graph.emf/.settings/org.eclipse.jdt.core.prefs diff --git a/org.cloudsmith.graph.emf/.settings/org.eclipse.jdt.ui.prefs b/com.puppetlabs.graph.emf/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.cloudsmith.graph.emf/.settings/org.eclipse.jdt.ui.prefs rename to com.puppetlabs.graph.emf/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.cloudsmith.graph.emf/META-INF/MANIFEST.MF b/com.puppetlabs.graph.emf/META-INF/MANIFEST.MF similarity index 60% rename from org.cloudsmith.graph.emf/META-INF/MANIFEST.MF rename to com.puppetlabs.graph.emf/META-INF/MANIFEST.MF index 0ac48da..8e66fa2 100644 --- a/org.cloudsmith.graph.emf/META-INF/MANIFEST.MF +++ b/com.puppetlabs.graph.emf/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: org.cloudsmith.graph.emf -Bundle-SymbolicName: org.cloudsmith.graph.emf +Bundle-Name: com.puppetlabs.graph.emf +Bundle-SymbolicName: com.puppetlabs.graph.emf Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.cloudsmith.graph.emf.Activator +Bundle-Activator: com.puppetlabs.graph.emf.Activator Bundle-Vendor: Cloudsmith Inc. Require-Bundle: org.eclipse.core.runtime, - org.cloudsmith.graph, + com.puppetlabs.graph, com.google.inject, com.google.guava, org.eclipse.emf.ecore Bundle-RequiredExecutionEnvironment: JavaSE-1.6, J2SE-1.5 Bundle-ActivationPolicy: lazy -Export-Package: org.cloudsmith.graph.emf +Export-Package: com.puppetlabs.graph.emf diff --git a/org.cloudsmith.graph.emf/build.properties b/com.puppetlabs.graph.emf/build.properties similarity index 100% rename from org.cloudsmith.graph.emf/build.properties rename to com.puppetlabs.graph.emf/build.properties diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/AbstractEGraphProvider.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/AbstractEGraphProvider.java similarity index 86% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/AbstractEGraphProvider.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/AbstractEGraphProvider.java index 02e60bf..fbb2e71 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/AbstractEGraphProvider.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/AbstractEGraphProvider.java @@ -9,16 +9,16 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.graphcss.Rule; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.graphcss.Rule; import org.eclipse.emf.ecore.EObject; import com.google.inject.Inject; @@ -37,7 +37,7 @@ public abstract class AbstractEGraphProvider implements IGraphProvider { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.IGraphProvider#computeGraph() + * @see com.puppetlabs.graph.IGraphProvider#computeGraph() */ @Override public IRootGraph computeGraph() { @@ -47,7 +47,7 @@ public IRootGraph computeGraph() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.IGraphProvider#computeGraph(java.lang.Object) + * @see com.puppetlabs.graph.IGraphProvider#computeGraph(java.lang.Object) */ @Override public IRootGraph computeGraph(Object model) { @@ -57,7 +57,7 @@ public IRootGraph computeGraph(Object model) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.emf.IEGraphProvider#computeGraph(org.eclipse.emf.ecore.EObject, java.lang.String, java.lang.String) + * @see com.puppetlabs.graph.emf.IEGraphProvider#computeGraph(org.eclipse.emf.ecore.EObject, java.lang.String, java.lang.String) */ @Override public IRootGraph computeGraph(Object modelObj, String label, String id) { diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/Activator.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/Activator.java similarity index 95% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/Activator.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/Activator.java index 65b5bbc..c951310 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/Activator.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/Activator.java @@ -1,4 +1,4 @@ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/ChainedListEGraphProvider.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/ChainedListEGraphProvider.java similarity index 95% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/ChainedListEGraphProvider.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/ChainedListEGraphProvider.java index ce850ca..5b4e9ad 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/ChainedListEGraphProvider.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/ChainedListEGraphProvider.java @@ -9,12 +9,12 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import java.util.List; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/DefaultEGraphModule.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/DefaultEGraphModule.java similarity index 91% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/DefaultEGraphModule.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/DefaultEGraphModule.java index 7c2bc9e..54d7f31 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/DefaultEGraphModule.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/DefaultEGraphModule.java @@ -9,10 +9,10 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; -import org.cloudsmith.graph.DefaultGraphModule; -import org.cloudsmith.graph.IGraphProvider; +import com.puppetlabs.graph.DefaultGraphModule; +import com.puppetlabs.graph.IGraphProvider; /** * A Default guice module for producing graphs for EMF models. Derived classes can override individual diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EAttributeBasedLabelStyleProvider.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EAttributeBasedLabelStyleProvider.java similarity index 91% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EAttributeBasedLabelStyleProvider.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EAttributeBasedLabelStyleProvider.java index 6efa18a..d278eea 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EAttributeBasedLabelStyleProvider.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EAttributeBasedLabelStyleProvider.java @@ -9,7 +9,7 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import java.util.Collection; import java.util.Collections; @@ -17,17 +17,17 @@ import java.util.List; import java.util.Map; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.Alignment; -import org.cloudsmith.graph.style.Compass; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.Span; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.style.labels.LabelStringTemplate; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.Alignment; +import com.puppetlabs.graph.style.Compass; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.Span; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.style.labels.LabelStringTemplate; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -151,7 +151,7 @@ public int compare(EAttribute o1, EAttribute o2) { } }); - org.cloudsmith.graph.style.labels.LabelRow labelRows[] = new org.cloudsmith.graph.style.labels.LabelRow[attributes.size() + 1]; + com.puppetlabs.graph.style.labels.LabelRow labelRows[] = new com.puppetlabs.graph.style.labels.LabelRow[attributes.size() + 1]; // First row contains an index cell that spans all rows // Class-name cell spans two columns. diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EEdge.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EEdge.java similarity index 89% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EEdge.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EEdge.java index 1869e70..8783e19 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EEdge.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EEdge.java @@ -9,11 +9,11 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; -import org.cloudsmith.graph.IVertex; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.style.themes.DefaultStyleTheme; +import com.puppetlabs.graph.IVertex; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.style.themes.DefaultStyleTheme; import org.eclipse.emf.ecore.EReference; /** diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EVertex.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EVertex.java similarity index 97% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EVertex.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EVertex.java index fc583ba..0a73ebd 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/EVertex.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/EVertex.java @@ -9,9 +9,9 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; -import org.cloudsmith.graph.elements.Vertex; +import com.puppetlabs.graph.elements.Vertex; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/GraphElementAdapter.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/GraphElementAdapter.java similarity index 94% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/GraphElementAdapter.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/GraphElementAdapter.java index dfba934..4fed1d6 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/GraphElementAdapter.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/GraphElementAdapter.java @@ -7,11 +7,11 @@ * Contributors: * - Cloudsmith Inc - initial API and implementation. */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import java.util.WeakHashMap; -import org.cloudsmith.graph.IGraphElement; +import com.puppetlabs.graph.IGraphElement; import org.eclipse.emf.common.notify.impl.AdapterImpl; /** diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/GraphElementAdapterFactory.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/GraphElementAdapterFactory.java similarity index 97% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/GraphElementAdapterFactory.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/GraphElementAdapterFactory.java index 677e434..2a096ea 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/GraphElementAdapterFactory.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/GraphElementAdapterFactory.java @@ -7,7 +7,7 @@ * Contributors: * - Cloudsmith Inc - initial API and implementation. */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/HorizontalArrayListEGraphProvider.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/HorizontalArrayListEGraphProvider.java similarity index 85% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/HorizontalArrayListEGraphProvider.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/HorizontalArrayListEGraphProvider.java index 2033f3e..e4edfa3 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/HorizontalArrayListEGraphProvider.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/HorizontalArrayListEGraphProvider.java @@ -9,20 +9,20 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import java.util.List; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.elements.Vertex; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.style.Compass; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.LineType; -import org.cloudsmith.graph.style.NodeShape; -import org.cloudsmith.graph.style.labels.LabelMatrix; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Vertex; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.style.Compass; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.LineType; +import com.puppetlabs.graph.style.NodeShape; +import com.puppetlabs.graph.style.labels.LabelMatrix; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; @@ -104,7 +104,7 @@ protected void computeGraph(RootGraph g, EVertex v, EObject model) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.emf.AbstractEGraphProvider#getRules() + * @see com.puppetlabs.graph.emf.AbstractEGraphProvider#getRules() */ @Override public Iterable getRules() { diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/IELabelStyleProvider.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/IELabelStyleProvider.java similarity index 89% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/IELabelStyleProvider.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/IELabelStyleProvider.java index d29ddaf..66f38bc 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/IELabelStyleProvider.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/IELabelStyleProvider.java @@ -9,11 +9,11 @@ * Cloudsmith * */ -package org.cloudsmith.graph.emf; +package com.puppetlabs.graph.emf; import java.util.Collection; -import org.cloudsmith.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Rule; import org.eclipse.emf.ecore.EObject; /** diff --git a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/package-info.java b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/package-info.java similarity index 86% rename from org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/package-info.java rename to com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/package-info.java index 758a3f5..bcbef46 100644 --- a/org.cloudsmith.graph.emf/src/org/cloudsmith/graph/emf/package-info.java +++ b/com.puppetlabs.graph.emf/src/com/puppetlabs/graph/emf/package-info.java @@ -12,7 +12,7 @@ /** * This package contains classes that translates an EMF ecore model instance into Graphviz dot * notation under control - * of a {@link org.cloudsmith.graph.graphcss.GraphCSS}. The classes in this package can be injected with + * of a {@link com.puppetlabs.graph.graphcss.GraphCSS}. The classes in this package can be injected with * Google Guice, but can also be instantiated manually. */ -package org.cloudsmith.graph.emf; \ No newline at end of file +package com.puppetlabs.graph.emf; \ No newline at end of file diff --git a/org.cloudsmith.graph.tests/.classpath b/com.puppetlabs.graph.tests/.classpath similarity index 100% rename from org.cloudsmith.graph.tests/.classpath rename to com.puppetlabs.graph.tests/.classpath diff --git a/org.cloudsmith.graph.tests/.gitignore b/com.puppetlabs.graph.tests/.gitignore similarity index 100% rename from org.cloudsmith.graph.tests/.gitignore rename to com.puppetlabs.graph.tests/.gitignore diff --git a/org.cloudsmith.graph.tests/.project b/com.puppetlabs.graph.tests/.project similarity index 93% rename from org.cloudsmith.graph.tests/.project rename to com.puppetlabs.graph.tests/.project index cfaf4db..a9d9056 100644 --- a/org.cloudsmith.graph.tests/.project +++ b/com.puppetlabs.graph.tests/.project @@ -1,6 +1,6 @@ - org.cloudsmith.graph.tests + com.puppetlabs.graph.tests diff --git a/org.cloudsmith.graph.tests/.settings/org.eclipse.core.resources.prefs b/com.puppetlabs.graph.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.cloudsmith.graph.tests/.settings/org.eclipse.core.resources.prefs rename to com.puppetlabs.graph.tests/.settings/org.eclipse.core.resources.prefs diff --git a/org.cloudsmith.graph.tests/.settings/org.eclipse.jdt.core.prefs b/com.puppetlabs.graph.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.cloudsmith.graph.tests/.settings/org.eclipse.jdt.core.prefs rename to com.puppetlabs.graph.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/org.cloudsmith.graph.tests/.settings/org.eclipse.jdt.ui.prefs b/com.puppetlabs.graph.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.cloudsmith.graph.tests/.settings/org.eclipse.jdt.ui.prefs rename to com.puppetlabs.graph.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.cloudsmith.graph.tests/META-INF/MANIFEST.MF b/com.puppetlabs.graph.tests/META-INF/MANIFEST.MF similarity index 51% rename from org.cloudsmith.graph.tests/META-INF/MANIFEST.MF rename to com.puppetlabs.graph.tests/META-INF/MANIFEST.MF index b9e745a..67cb99d 100644 --- a/org.cloudsmith.graph.tests/META-INF/MANIFEST.MF +++ b/com.puppetlabs.graph.tests/META-INF/MANIFEST.MF @@ -1,19 +1,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests -Bundle-SymbolicName: org.cloudsmith.graph.tests +Bundle-SymbolicName: com.puppetlabs.graph.tests Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.cloudsmith.graph.tests.Activator -Require-Bundle: org.cloudsmith.graph, +Bundle-Activator: com.puppetlabs.graph.tests.Activator +Require-Bundle: com.puppetlabs.graph, org.eclipse.core.runtime, org.eclipse.emf.ecore, com.google.guava, com.google.inject, org.junit, - org.cloudsmith.geppetto.pp, - org.cloudsmith.geppetto.common, - org.cloudsmith.graph.emf + com.puppetlabs.geppetto.pp, + com.puppetlabs.geppetto.common, + com.puppetlabs.graph.emf Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6, J2SE-1.5 -Export-Package: org.cloudsmith.graph.tests +Export-Package: com.puppetlabs.graph.tests diff --git a/org.cloudsmith.graph.tests/build.properties b/com.puppetlabs.graph.tests/build.properties similarity index 100% rename from org.cloudsmith.graph.tests/build.properties rename to com.puppetlabs.graph.tests/build.properties diff --git a/org.cloudsmith.graph.tests/output/.gitignore b/com.puppetlabs.graph.tests/output/.gitignore similarity index 100% rename from org.cloudsmith.graph.tests/output/.gitignore rename to com.puppetlabs.graph.tests/output/.gitignore diff --git a/org.cloudsmith.graph.tests/output/output.html b/com.puppetlabs.graph.tests/output/output.html similarity index 100% rename from org.cloudsmith.graph.tests/output/output.html rename to com.puppetlabs.graph.tests/output/output.html diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/Activator.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/Activator.java similarity index 95% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/Activator.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/Activator.java index 7ce62d7..6890ae0 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/Activator.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/Activator.java @@ -1,4 +1,4 @@ -package org.cloudsmith.graph; +package com.puppetlabs.graph; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/AbstractTestGraph.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/AbstractTestGraph.java similarity index 80% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/AbstractTestGraph.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/AbstractTestGraph.java index 3106b07..eeb9efc 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/AbstractTestGraph.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/AbstractTestGraph.java @@ -6,20 +6,20 @@ * prior written consent or license from Cloudsmith Inc. ******************************************************************/ -package org.cloudsmith.graph.testgraphs; +package com.puppetlabs.graph.testgraphs; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.IStyleFactory; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.IStyleFactory; import com.google.common.collect.Lists; import com.google.inject.Inject; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/SimpleGraph1.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/SimpleGraph1.java similarity index 77% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/SimpleGraph1.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/SimpleGraph1.java index 6882d19..0179680 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/SimpleGraph1.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/SimpleGraph1.java @@ -6,23 +6,23 @@ * prior written consent or license from Cloudsmith Inc. ******************************************************************/ -package org.cloudsmith.graph.testgraphs; +package com.puppetlabs.graph.testgraphs; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.elements.Vertex; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.IStyleFactory; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Vertex; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.IStyleFactory; import com.google.common.collect.Lists; import com.google.inject.Inject; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/SimpleGraph2.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/SimpleGraph2.java similarity index 78% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/SimpleGraph2.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/SimpleGraph2.java index 9bc8eda..a2cbd96 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/SimpleGraph2.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/SimpleGraph2.java @@ -6,24 +6,24 @@ * prior written consent or license from Cloudsmith Inc. ******************************************************************/ -package org.cloudsmith.graph.testgraphs; +package com.puppetlabs.graph.testgraphs; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.elements.ClusterGraph; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.elements.Vertex; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.IStyleFactory; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.elements.ClusterGraph; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Vertex; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.IStyleFactory; import com.google.common.collect.Lists; import com.google.inject.Inject; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/TestGraph.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/TestGraph.java similarity index 85% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/TestGraph.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/TestGraph.java index 28142ad..dd9066f 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/testgraphs/TestGraph.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/testgraphs/TestGraph.java @@ -6,30 +6,30 @@ * prior written consent or license from Cloudsmith Inc. ******************************************************************/ -package org.cloudsmith.graph.testgraphs; +package com.puppetlabs.graph.testgraphs; import java.util.Collection; import java.util.List; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.elements.ClusterGraph; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.elements.Vertex; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.Alignment; -import org.cloudsmith.graph.style.Arrow; -import org.cloudsmith.graph.style.Compass; -import org.cloudsmith.graph.style.EdgeRouting; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.LineType; -import org.cloudsmith.graph.style.NodeShape; -import org.cloudsmith.graph.style.labels.LabelTable; -import org.cloudsmith.graph.style.labels.LabelTableBuilder; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.elements.ClusterGraph; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Vertex; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.Alignment; +import com.puppetlabs.graph.style.Arrow; +import com.puppetlabs.graph.style.Compass; +import com.puppetlabs.graph.style.EdgeRouting; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.LineType; +import com.puppetlabs.graph.style.NodeShape; +import com.puppetlabs.graph.style.labels.LabelTable; +import com.puppetlabs.graph.style.labels.LabelTableBuilder; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; @@ -90,7 +90,7 @@ public IRootGraph computeGraph() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.IGraphProvider#computeGraph() + * @see com.puppetlabs.graph.IGraphProvider#computeGraph() */ @Override public IRootGraph computeGraph(Object modelObj) { diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/AbstractGraphTests.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/AbstractGraphTests.java similarity index 93% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/AbstractGraphTests.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/AbstractGraphTests.java index c4370c0..d543407 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/AbstractGraphTests.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/AbstractGraphTests.java @@ -9,14 +9,14 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import java.io.File; import java.io.IOException; import java.net.URL; -import org.cloudsmith.geppetto.common.os.FileUtils; -import org.cloudsmith.graph.DefaultGraphModule; +import com.puppetlabs.geppetto.common.os.FileUtils; +import com.puppetlabs.graph.DefaultGraphModule; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/Activator.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/Activator.java similarity index 94% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/Activator.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/Activator.java index 8fed5a1..dfe5312 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/Activator.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/Activator.java @@ -1,4 +1,4 @@ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/GraphTests.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/GraphTests.java similarity index 95% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/GraphTests.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/GraphTests.java index aab43f5..3902cfc 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/GraphTests.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/GraphTests.java @@ -9,7 +9,7 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestBase64.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestBase64.java similarity index 91% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestBase64.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestBase64.java index 07b7f21..ca2e77d 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestBase64.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestBase64.java @@ -9,11 +9,11 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertEquals; -import org.cloudsmith.graph.utils.Base64; +import com.puppetlabs.graph.utils.Base64; import org.junit.Test; /** diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestBasicFeatures.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestBasicFeatures.java similarity index 89% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestBasicFeatures.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestBasicFeatures.java index 4b8b09c..a56b5a7 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestBasicFeatures.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestBasicFeatures.java @@ -9,29 +9,29 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.dot.DotRenderer; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.elements.Vertex; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphviz.GraphvizFormat; -import org.cloudsmith.graph.graphviz.GraphvizLayout; -import org.cloudsmith.graph.graphviz.GraphvizRenderer; -import org.cloudsmith.graph.graphviz.IGraphviz; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.testgraphs.AbstractTestGraph; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.dot.DotRenderer; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Vertex; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphviz.GraphvizFormat; +import com.puppetlabs.graph.graphviz.GraphvizLayout; +import com.puppetlabs.graph.graphviz.GraphvizRenderer; +import com.puppetlabs.graph.graphviz.IGraphviz; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.testgraphs.AbstractTestGraph; import org.junit.Test; import com.google.inject.Inject; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestCircularByteBuffer.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestCircularByteBuffer.java similarity index 98% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestCircularByteBuffer.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestCircularByteBuffer.java index c5448b9..dfebbff 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestCircularByteBuffer.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestCircularByteBuffer.java @@ -9,7 +9,7 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -18,7 +18,7 @@ import java.io.ByteArrayOutputStream; import java.util.NoSuchElementException; -import org.cloudsmith.graph.utils.CircularByteQueue; +import com.puppetlabs.graph.utils.CircularByteQueue; import org.junit.Test; /** diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestEGraph.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestEGraph.java similarity index 84% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestEGraph.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestEGraph.java index f6cb1d1..7b73e64 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestEGraph.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestEGraph.java @@ -9,7 +9,7 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertTrue; @@ -17,22 +17,22 @@ import java.io.FileOutputStream; import java.io.IOException; -import org.cloudsmith.geppetto.pp.AssignmentExpression; -import org.cloudsmith.geppetto.pp.Expression; -import org.cloudsmith.geppetto.pp.PPFactory; -import org.cloudsmith.geppetto.pp.PuppetManifest; -import org.cloudsmith.geppetto.pp.SingleQuotedString; -import org.cloudsmith.geppetto.pp.VariableExpression; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.dot.DotRenderer; -import org.cloudsmith.graph.emf.DefaultEGraphModule; -import org.cloudsmith.graph.emf.HorizontalArrayListEGraphProvider; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphviz.GraphvizLayout; -import org.cloudsmith.graph.graphviz.IGraphviz; -import org.cloudsmith.graph.style.themes.IStyleTheme; +import com.puppetlabs.geppetto.pp.AssignmentExpression; +import com.puppetlabs.geppetto.pp.Expression; +import com.puppetlabs.geppetto.pp.PPFactory; +import com.puppetlabs.geppetto.pp.PuppetManifest; +import com.puppetlabs.geppetto.pp.SingleQuotedString; +import com.puppetlabs.geppetto.pp.VariableExpression; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.dot.DotRenderer; +import com.puppetlabs.graph.emf.DefaultEGraphModule; +import com.puppetlabs.graph.emf.HorizontalArrayListEGraphProvider; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphviz.GraphvizLayout; +import com.puppetlabs.graph.graphviz.IGraphviz; +import com.puppetlabs.graph.style.themes.IStyleTheme; import org.eclipse.emf.common.util.EList; import org.junit.Test; @@ -61,7 +61,7 @@ private AssignmentExpression getAssignmentExpression(String varName, String valu /* * (non-Javadoc) * - * @see org.cloudsmith.graph.tests.AbstractGraphTests#getModule() + * @see com.puppetlabs.graph.tests.AbstractGraphTests#getModule() */ @Override protected Module getModule() { diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestMockGraph.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestMockGraph.java similarity index 85% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestMockGraph.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestMockGraph.java index b465b0e..a1f20e1 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestMockGraph.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestMockGraph.java @@ -9,20 +9,20 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.dot.DotRenderer; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.style.themes.IStyleTheme; -import org.cloudsmith.graph.testgraphs.SimpleGraph1; -import org.cloudsmith.graph.testgraphs.TestGraph; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.dot.DotRenderer; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.style.themes.IStyleTheme; +import com.puppetlabs.graph.testgraphs.SimpleGraph1; +import com.puppetlabs.graph.testgraphs.TestGraph; import org.junit.Test; /** diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestRenderingToPng.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestRenderingToPng.java similarity index 88% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestRenderingToPng.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestRenderingToPng.java index 1097c0a..ac43a7c 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestRenderingToPng.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestRenderingToPng.java @@ -9,7 +9,7 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertTrue; @@ -17,19 +17,19 @@ import java.io.FileOutputStream; import java.io.IOException; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IGraphProvider; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.dot.DotRenderer; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphviz.GraphvizLayout; -import org.cloudsmith.graph.graphviz.IGraphviz; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.RankDirection; -import org.cloudsmith.graph.style.themes.IStyleTheme; -import org.cloudsmith.graph.testgraphs.SimpleGraph1; -import org.cloudsmith.graph.testgraphs.SimpleGraph2; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraphProvider; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.dot.DotRenderer; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphviz.GraphvizLayout; +import com.puppetlabs.graph.graphviz.IGraphviz; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.RankDirection; +import com.puppetlabs.graph.style.themes.IStyleTheme; +import com.puppetlabs.graph.testgraphs.SimpleGraph1; +import com.puppetlabs.graph.testgraphs.SimpleGraph2; import org.junit.Test; /** diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestRuleBasedFilterStream.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestRuleBasedFilterStream.java similarity index 91% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestRuleBasedFilterStream.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestRuleBasedFilterStream.java index 364f798..ac5feff 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestRuleBasedFilterStream.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestRuleBasedFilterStream.java @@ -9,7 +9,7 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,9 +17,9 @@ import java.io.ByteArrayOutputStream; -import org.cloudsmith.graph.graphviz.SVGFixerOutputStream; -import org.cloudsmith.graph.utils.RuleFilteredOutputStream; -import org.cloudsmith.graph.utils.RuleFilteredOutputStream.ReplaceRule; +import com.puppetlabs.graph.graphviz.SVGFixerOutputStream; +import com.puppetlabs.graph.utils.RuleFilteredOutputStream; +import com.puppetlabs.graph.utils.RuleFilteredOutputStream.ReplaceRule; import org.junit.Test; /** diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestSVGFixer.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestSVGFixer.java similarity index 94% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestSVGFixer.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestSVGFixer.java index 860dc49..2a5a24b 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/tests/TestSVGFixer.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/tests/TestSVGFixer.java @@ -9,14 +9,14 @@ * Cloudsmith * */ -package org.cloudsmith.graph.tests; +package com.puppetlabs.graph.tests; import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; -import org.cloudsmith.graph.graphviz.SVGFixerOutputStream; -import org.cloudsmith.graph.utils.Base64; +import com.puppetlabs.graph.graphviz.SVGFixerOutputStream; +import com.puppetlabs.graph.utils.Base64; import org.junit.Test; /** diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/utils/AbstractGraphStyleRuleSetProvider.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/utils/AbstractGraphStyleRuleSetProvider.java similarity index 84% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/utils/AbstractGraphStyleRuleSetProvider.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/utils/AbstractGraphStyleRuleSetProvider.java index 01ab357..63247ec 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/utils/AbstractGraphStyleRuleSetProvider.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/utils/AbstractGraphStyleRuleSetProvider.java @@ -1,18 +1,18 @@ -package org.cloudsmith.graph.utils; - -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.graphviz.GraphvizLayout; -import org.cloudsmith.graph.style.Arrow; -import org.cloudsmith.graph.style.Compass; -import org.cloudsmith.graph.style.EdgeRouting; -import org.cloudsmith.graph.style.LineType; -import org.cloudsmith.graph.style.NodeShape; -import org.cloudsmith.graph.style.RankDirection; -import org.cloudsmith.graph.style.StyleFactory; +package com.puppetlabs.graph.utils; + +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.graphviz.GraphvizLayout; +import com.puppetlabs.graph.style.Arrow; +import com.puppetlabs.graph.style.Compass; +import com.puppetlabs.graph.style.EdgeRouting; +import com.puppetlabs.graph.style.LineType; +import com.puppetlabs.graph.style.NodeShape; +import com.puppetlabs.graph.style.RankDirection; +import com.puppetlabs.graph.style.StyleFactory; /** * TODO: UNFINISHED, USES OLD STYLE FIELD NAMES m_ @@ -22,7 +22,7 @@ */ public class AbstractGraphStyleRuleSetProvider implements IGraphStyleRuleSetProvider { - protected GraphvizLayout m_layout = org.cloudsmith.graph.graphviz.GraphvizLayout.dot; + protected GraphvizLayout m_layout = com.puppetlabs.graph.graphviz.GraphvizLayout.dot; protected Arrow m_headArrow = Arrow.vee; diff --git a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/utils/IGraphStyleRuleSetProvider.java b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/utils/IGraphStyleRuleSetProvider.java similarity index 58% rename from org.cloudsmith.graph.tests/src/org/cloudsmith/graph/utils/IGraphStyleRuleSetProvider.java rename to com.puppetlabs.graph.tests/src/com/puppetlabs/graph/utils/IGraphStyleRuleSetProvider.java index b0ff2b2..d3b91c5 100644 --- a/org.cloudsmith.graph.tests/src/org/cloudsmith/graph/utils/IGraphStyleRuleSetProvider.java +++ b/com.puppetlabs.graph.tests/src/com/puppetlabs/graph/utils/IGraphStyleRuleSetProvider.java @@ -1,4 +1,4 @@ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; public interface IGraphStyleRuleSetProvider { diff --git a/org.cloudsmith.graph/.classpath b/com.puppetlabs.graph/.classpath similarity index 100% rename from org.cloudsmith.graph/.classpath rename to com.puppetlabs.graph/.classpath diff --git a/org.cloudsmith.graph/.gitignore b/com.puppetlabs.graph/.gitignore similarity index 100% rename from org.cloudsmith.graph/.gitignore rename to com.puppetlabs.graph/.gitignore diff --git a/org.cloudsmith.graph/.project b/com.puppetlabs.graph/.project similarity index 95% rename from org.cloudsmith.graph/.project rename to com.puppetlabs.graph/.project index 1721b47..9d1e3cf 100644 --- a/org.cloudsmith.graph/.project +++ b/com.puppetlabs.graph/.project @@ -1,6 +1,6 @@ - org.cloudsmith.graph + com.puppetlabs.graph diff --git a/org.cloudsmith.graph/.settings/org.eclipse.jdt.core.prefs b/com.puppetlabs.graph/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.cloudsmith.graph/.settings/org.eclipse.jdt.core.prefs rename to com.puppetlabs.graph/.settings/org.eclipse.jdt.core.prefs diff --git a/org.cloudsmith.graph/.settings/org.eclipse.jdt.ui.prefs b/com.puppetlabs.graph/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.cloudsmith.graph/.settings/org.eclipse.jdt.ui.prefs rename to com.puppetlabs.graph/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.cloudsmith.graph/.settings/org.eclipse.m2e.core.prefs b/com.puppetlabs.graph/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.cloudsmith.graph/.settings/org.eclipse.m2e.core.prefs rename to com.puppetlabs.graph/.settings/org.eclipse.m2e.core.prefs diff --git a/org.cloudsmith.graph/META-INF/MANIFEST.MF b/com.puppetlabs.graph/META-INF/MANIFEST.MF similarity index 54% rename from org.cloudsmith.graph/META-INF/MANIFEST.MF rename to com.puppetlabs.graph/META-INF/MANIFEST.MF index c2cdade..5ee08da 100644 --- a/org.cloudsmith.graph/META-INF/MANIFEST.MF +++ b/com.puppetlabs.graph/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Graph -Bundle-SymbolicName: org.cloudsmith.graph +Bundle-SymbolicName: com.puppetlabs.graph Bundle-Version: 1.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6, @@ -11,12 +11,12 @@ Import-Package: com.google.common.collect;version="10.0.0", com.google.inject;version="[1.3.0,1.4.0)", com.google.inject.binder;version="[1.3.0,1.4.0)", org.apache.log4j -Export-Package: org.cloudsmith.graph, - org.cloudsmith.graph.dot, - org.cloudsmith.graph.graphcss, - org.cloudsmith.graph.graphviz, - org.cloudsmith.graph.elements, - org.cloudsmith.graph.style, - org.cloudsmith.graph.style.themes, - org.cloudsmith.graph.style.labels, - org.cloudsmith.graph.utils +Export-Package: com.puppetlabs.graph, + com.puppetlabs.graph.dot, + com.puppetlabs.graph.graphcss, + com.puppetlabs.graph.graphviz, + com.puppetlabs.graph.elements, + com.puppetlabs.graph.style, + com.puppetlabs.graph.style.themes, + com.puppetlabs.graph.style.labels, + com.puppetlabs.graph.utils diff --git a/org.cloudsmith.graph/about.html b/com.puppetlabs.graph/about.html similarity index 88% rename from org.cloudsmith.graph/about.html rename to com.puppetlabs.graph/about.html index 7966136..10f95cf 100644 --- a/org.cloudsmith.graph/about.html +++ b/com.puppetlabs.graph/about.html @@ -12,7 +12,7 @@

About This Content

License

-Licensed by Cloudsmith Inc. (the "Licensor") under the Apache License, Version 2.0 (the "License"); +Licensed by Puppet Labs, Inc. (the "Licensor") under the Apache License, Version 2.0 (the "License"); you may not use this software except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. @@ -28,7 +28,7 @@

License

This work includes work (the "EPL Code") originally licensed under the Eclipse Public License, Version 1.0 (the "EPL"). Source for the EPL Code is available at -http://github.com/cloudsmith/graph. +http://github.com/puppetlabs/graph.

diff --git a/org.cloudsmith.graph/build.properties b/com.puppetlabs.graph/build.properties similarity index 78% rename from org.cloudsmith.graph/build.properties rename to com.puppetlabs.graph/build.properties index 3c2eab9..c5d6897 100644 --- a/org.cloudsmith.graph/build.properties +++ b/com.puppetlabs.graph/build.properties @@ -1,11 +1,11 @@ -# Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. +# Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # # Contributors: -# Cloudsmith +# Puppet Labs # source.. = src/ output.. = target/classes/ diff --git a/org.cloudsmith.graph/images/no_image.png b/com.puppetlabs.graph/images/no_image.png similarity index 100% rename from org.cloudsmith.graph/images/no_image.png rename to com.puppetlabs.graph/images/no_image.png diff --git a/org.cloudsmith.graph/pom.xml b/com.puppetlabs.graph/pom.xml similarity index 85% rename from org.cloudsmith.graph/pom.xml rename to com.puppetlabs.graph/pom.xml index edd11c9..b2f6249 100644 --- a/org.cloudsmith.graph/pom.xml +++ b/com.puppetlabs.graph/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - org.cloudsmith.graph + com.puppetlabs.graph parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT - org.cloudsmith.graph + com.puppetlabs.graph src diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/DefaultGraphModule.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/DefaultGraphModule.java similarity index 72% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/DefaultGraphModule.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/DefaultGraphModule.java index 571b392..bf2388c 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/DefaultGraphModule.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/DefaultGraphModule.java @@ -1,32 +1,30 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; - -import org.cloudsmith.graph.dot.DotRenderer; -import org.cloudsmith.graph.graphcss.FunctionFactory; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphviz.DefaultGraphvizConfig; -import org.cloudsmith.graph.graphviz.Graphviz; -import org.cloudsmith.graph.graphviz.IGraphviz; -import org.cloudsmith.graph.graphviz.IGraphvizConfig; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.StyleFactory; -import org.cloudsmith.graph.style.themes.DefaultStyleTheme; -import org.cloudsmith.graph.style.themes.IStyleTheme; -import org.cloudsmith.graph.utils.IOutputStreamFilterFactory; -import org.cloudsmith.graph.utils.TransparentOutputStreamFilterFactory; +package com.puppetlabs.graph; import com.google.inject.AbstractModule; import com.google.inject.Singleton; +import com.puppetlabs.graph.dot.DotRenderer; +import com.puppetlabs.graph.graphcss.FunctionFactory; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphviz.DefaultGraphvizConfig; +import com.puppetlabs.graph.graphviz.Graphviz; +import com.puppetlabs.graph.graphviz.IGraphviz; +import com.puppetlabs.graph.graphviz.IGraphvizConfig; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.StyleFactory; +import com.puppetlabs.graph.style.themes.DefaultStyleTheme; +import com.puppetlabs.graph.style.themes.IStyleTheme; +import com.puppetlabs.graph.utils.IOutputStreamFilterFactory; +import com.puppetlabs.graph.utils.TransparentOutputStreamFilterFactory; /** * A default graph runtime module. @@ -46,7 +44,8 @@ protected void bindDotRenderer() { /** * Binds a normal empty string (i.e. "") for dot output. - * For SVG output, the {@link org.cloudsmith.graph.graphviz.SVGFixerOutputStreamSVGFixerOutputStream#EMPTY_STRING_BUG} can be bound in combination + * For SVG output, the {@link com.puppetlabs.graph.graphviz.SVGFixerOutputStreamSVGFixerOutputStream#EMPTY_STRING_BUG} can be + * bound in combination * with overriding {@link #bindSVGOutputFilterProvider()}. */ protected void bindEmptyStringConstant() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ElementType.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ElementType.java similarity index 93% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ElementType.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ElementType.java index 78dcf6b..d2ccb89 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ElementType.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ElementType.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; import java.util.EnumSet; import java.util.Set; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ICancel.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ICancel.java similarity index 92% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ICancel.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ICancel.java index 9990ebd..1eece80 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ICancel.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ICancel.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; import java.util.concurrent.CancellationException; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IClusterGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IClusterGraph.java similarity index 83% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IClusterGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IClusterGraph.java index e057957..e7bf4d6 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IClusterGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IClusterGraph.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * Marker interface for a graph having a non root role and being clustered. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IEdge.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IEdge.java similarity index 78% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IEdge.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IEdge.java index 0cd0e9e..066f259 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IEdge.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IEdge.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * Interface for an edge between two vertexes. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IGraph.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IGraph.java index 230ca84..aa8f516 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IGraph.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * The interface for a graph that is either the root graph or a subgraph. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IGraphElement.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IGraphElement.java similarity index 91% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IGraphElement.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IGraphElement.java index 5db8c4e..525680f 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IGraphElement.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IGraphElement.java @@ -1,21 +1,20 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import org.cloudsmith.graph.graphcss.StyleSet; +import com.puppetlabs.graph.graphcss.StyleSet; /** * The base interface for graph elements (graph, vertex, and edge). diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IGraphProvider.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IGraphProvider.java similarity index 91% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IGraphProvider.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IGraphProvider.java index 2b25afd..b80838f 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IGraphProvider.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IGraphProvider.java @@ -1,17 +1,16 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; -import org.cloudsmith.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Rule; /** * Interface for a provider of a an optionally styled graph. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ILabeledGraphElement.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ILabeledGraphElement.java similarity index 81% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ILabeledGraphElement.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ILabeledGraphElement.java index ea1ac59..701e940 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ILabeledGraphElement.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ILabeledGraphElement.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; - +package com.puppetlabs.graph; /** * A graph element that supports a label. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IRootGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IRootGraph.java similarity index 86% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IRootGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IRootGraph.java index 0611921..5b1605a 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IRootGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IRootGraph.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * Marker interface for a graph having a root role. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ISubGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ISubGraph.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ISubGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ISubGraph.java index 6e4af5e..7a76beb 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ISubGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ISubGraph.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * Marker interface for a graph having a non root role. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ITable.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ITable.java similarity index 72% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ITable.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ITable.java index 433f366..4ccc338 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ITable.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ITable.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; import java.util.List; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ITableCell.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ITableCell.java similarity index 74% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ITableCell.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ITableCell.java index 0af56e5..a7f5268 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ITableCell.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ITableCell.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * Interface for a Table Cell. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/ITableRow.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/ITableRow.java similarity index 73% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/ITableRow.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/ITableRow.java index 35f6f62..d1cc7b2 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/ITableRow.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/ITableRow.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; import java.util.List; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/IVertex.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/IVertex.java similarity index 73% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/IVertex.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/IVertex.java index 496082a..1ffb2ed 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/IVertex.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/IVertex.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph; +package com.puppetlabs.graph; /** * An interface for a Vertex (i.e. Node/Bubble) in a graph. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotGraphElementRenderer.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotGraphElementRenderer.java similarity index 86% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotGraphElementRenderer.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotGraphElementRenderer.java index d083a30..772f196 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotGraphElementRenderer.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotGraphElementRenderer.java @@ -1,46 +1,44 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.dot; +package com.puppetlabs.graph.dot; import java.io.PrintStream; import java.util.Collection; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.IEdge; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.ILabeledGraphElement; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.Alignment; -import org.cloudsmith.graph.style.Arrow; -import org.cloudsmith.graph.style.EdgeDirection; -import org.cloudsmith.graph.style.EdgeRouting; -import org.cloudsmith.graph.style.IStyle; -import org.cloudsmith.graph.style.IStyleVisitor; -import org.cloudsmith.graph.style.LineBrush; -import org.cloudsmith.graph.style.NodeShape; -import org.cloudsmith.graph.style.RankDirection; -import org.cloudsmith.graph.style.ShapeBrush; -import org.cloudsmith.graph.style.StyleType; -import org.cloudsmith.graph.style.StyleVisitor; -import org.cloudsmith.graph.style.VerticalAlignment; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.utils.Counter; - import com.google.common.collect.Iterators; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.IEdge; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.ILabeledGraphElement; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.Alignment; +import com.puppetlabs.graph.style.Arrow; +import com.puppetlabs.graph.style.EdgeDirection; +import com.puppetlabs.graph.style.EdgeRouting; +import com.puppetlabs.graph.style.IStyle; +import com.puppetlabs.graph.style.IStyleVisitor; +import com.puppetlabs.graph.style.LineBrush; +import com.puppetlabs.graph.style.NodeShape; +import com.puppetlabs.graph.style.RankDirection; +import com.puppetlabs.graph.style.ShapeBrush; +import com.puppetlabs.graph.style.StyleType; +import com.puppetlabs.graph.style.StyleVisitor; +import com.puppetlabs.graph.style.VerticalAlignment; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.utils.Counter; /** * Renders IGraphElements in Graphviz dot notation. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotLabelRenderer.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotLabelRenderer.java similarity index 88% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotLabelRenderer.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotLabelRenderer.java index cf27928..a1993ce 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotLabelRenderer.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotLabelRenderer.java @@ -1,53 +1,50 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ - -package org.cloudsmith.graph.dot; +package com.puppetlabs.graph.dot; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.Collection; import java.util.Set; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.ILabeledGraphElement; -import org.cloudsmith.graph.ITable; -import org.cloudsmith.graph.ITableCell; -import org.cloudsmith.graph.ITableRow; -import org.cloudsmith.graph.elements.GraphCell; -import org.cloudsmith.graph.elements.GraphRow; -import org.cloudsmith.graph.elements.GraphTable; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.Alignment; -import org.cloudsmith.graph.style.IStyle; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.IStyleVisitor; -import org.cloudsmith.graph.style.Span; -import org.cloudsmith.graph.style.StyleFactory; -import org.cloudsmith.graph.style.StyleType; -import org.cloudsmith.graph.style.StyleVisitor; -import org.cloudsmith.graph.style.VerticalAlignment; -import org.cloudsmith.graph.style.labels.DynamicLabelTemplate; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.style.labels.LabelCell; -import org.cloudsmith.graph.style.labels.LabelMatrix; -import org.cloudsmith.graph.style.labels.LabelRow; -import org.cloudsmith.graph.style.labels.LabelStringTemplate; -import org.cloudsmith.graph.style.labels.LabelTable; -import org.cloudsmith.graph.utils.Counter; - import com.google.inject.Inject; import com.google.inject.Singleton; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.ILabeledGraphElement; +import com.puppetlabs.graph.ITable; +import com.puppetlabs.graph.ITableCell; +import com.puppetlabs.graph.ITableRow; +import com.puppetlabs.graph.elements.GraphCell; +import com.puppetlabs.graph.elements.GraphRow; +import com.puppetlabs.graph.elements.GraphTable; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.Alignment; +import com.puppetlabs.graph.style.IStyle; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.IStyleVisitor; +import com.puppetlabs.graph.style.Span; +import com.puppetlabs.graph.style.StyleFactory; +import com.puppetlabs.graph.style.StyleType; +import com.puppetlabs.graph.style.StyleVisitor; +import com.puppetlabs.graph.style.VerticalAlignment; +import com.puppetlabs.graph.style.labels.DynamicLabelTemplate; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.style.labels.LabelCell; +import com.puppetlabs.graph.style.labels.LabelMatrix; +import com.puppetlabs.graph.style.labels.LabelRow; +import com.puppetlabs.graph.style.labels.LabelStringTemplate; +import com.puppetlabs.graph.style.labels.LabelTable; +import com.puppetlabs.graph.utils.Counter; /** * Renders dot labels. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotRenderer.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotRenderer.java similarity index 90% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotRenderer.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotRenderer.java index d0d0a03..4f6b3d4 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/DotRenderer.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/DotRenderer.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.dot; +package com.puppetlabs.graph.dot; import java.io.ByteArrayOutputStream; import java.io.OutputStream; @@ -19,24 +18,23 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.IEdge; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.IVertex; -import org.cloudsmith.graph.elements.Edge; -import org.cloudsmith.graph.elements.RootGraph; -import org.cloudsmith.graph.elements.Vertex; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.StyleFactory; -import org.cloudsmith.graph.style.StyleType; - import com.google.common.collect.Iterators; import com.google.inject.BindingAnnotation; import com.google.inject.Inject; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.IEdge; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.IVertex; +import com.puppetlabs.graph.elements.Edge; +import com.puppetlabs.graph.elements.RootGraph; +import com.puppetlabs.graph.elements.Vertex; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.StyleFactory; +import com.puppetlabs.graph.style.StyleType; /** * Produces dot output from a Graph instance. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/package-info.java similarity index 57% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/dot/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/dot/package-info.java index a605f4a..7395a64 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/dot/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/dot/package-info.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** - * This package contains classes that translates an {@link org.cloudsmith.graph.IGraph} into Graphviz dot + * This package contains classes that translates an {@link com.puppetlabs.graph.IGraph} into Graphviz dot * notation under control - * of a {@link org.cloudsmith.graph.graphcss.GraphCSS}. The classes in this package can be injected with + * of a {@link com.puppetlabs.graph.graphcss.GraphCSS}. The classes in this package can be injected with * Google Guice, but can also be instantiated manually. */ -package org.cloudsmith.graph.dot; \ No newline at end of file +package com.puppetlabs.graph.dot; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/ClusterGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/ClusterGraph.java similarity index 76% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/ClusterGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/ClusterGraph.java index 3080aeb..a165ba5 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/ClusterGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/ClusterGraph.java @@ -1,20 +1,19 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.ILabeledGraphElement; -import org.cloudsmith.graph.IRootGraph; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.ILabeledGraphElement; +import com.puppetlabs.graph.IRootGraph; /** * A concrete implementation of ISubGraph. A SubGraph acts as a container with no visual bounds or appearance of @@ -46,7 +45,7 @@ public ClusterGraph(String label, String styleClass, String id) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.ISubGraph#asClusterGraph(java.lang.String) + * @see com.puppetlabs.graph.ISubGraph#asClusterGraph(java.lang.String) */ @Override public IClusterGraph asClusterGraph(String label) { @@ -61,7 +60,7 @@ public IRootGraph asRootGraph() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.ISubGraph#asRootGraph(java.lang.String) + * @see com.puppetlabs.graph.ISubGraph#asRootGraph(java.lang.String) */ @Override public IRootGraph asRootGraph(String label) { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Edge.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Edge.java similarity index 80% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Edge.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Edge.java index 541689f..f418edc 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Edge.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Edge.java @@ -1,22 +1,21 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; import java.util.Collections; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IEdge; -import org.cloudsmith.graph.IVertex; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IEdge; +import com.puppetlabs.graph.IVertex; /** * Edges can go between any two vertices including those nested in subgraphs (as well as subgraphs). @@ -72,7 +71,7 @@ public Edge(String label, String styleClass, IVertex from, IVertex to, String id /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.GraphElement#getElementType() + * @see com.puppetlabs.graph.impl.GraphElement#getElementType() */ @Override public ElementType getElementType() { @@ -82,7 +81,7 @@ public ElementType getElementType() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.GraphElement#getFrom() + * @see com.puppetlabs.graph.impl.GraphElement#getFrom() */ @Override public IVertex getFrom() { @@ -92,7 +91,7 @@ public IVertex getFrom() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.GraphElement#getTo() + * @see com.puppetlabs.graph.impl.GraphElement#getTo() */ @Override public IVertex getTo() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Graph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Graph.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Graph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Graph.java index 5d486eb..f5d82cc 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Graph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Graph.java @@ -1,27 +1,25 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IEdge; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.ISubGraph; -import org.cloudsmith.graph.IVertex; - import com.google.common.collect.Iterables; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IEdge; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.ISubGraph; +import com.puppetlabs.graph.IVertex; /** * A graph is a container of other graph elements (which include other graphs as subgraphs, vertexes and edges). @@ -150,7 +148,7 @@ public Iterable getEdges() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.elements.Vertex#getElementType() + * @see com.puppetlabs.graph.elements.Vertex#getElementType() */ @Override public ElementType getElementType() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphCell.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphCell.java similarity index 85% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphCell.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphCell.java index cc6339d..2d72538 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphCell.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphCell.java @@ -1,20 +1,19 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.ITableCell; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.ITableCell; /** * Implementation of ITableCell @@ -47,6 +46,15 @@ public boolean isSeparator() { // this.value = value; // } + public GraphCell(String value, Collection styleClasses) { + this(value, styleClasses, null); + } + + public GraphCell(String value, Collection styleClasses, String id) { + super(styleClasses, id); + this.value = value; + } + /** * Creates a default cell with null id. * @@ -56,27 +64,14 @@ public GraphCell(String value, String styleClass) { this(value, styleClass, null); } - public GraphCell(String value, Collection styleClasses) { - this(value, styleClasses, null); - } - public GraphCell(String value, String styleClass, String id) { super(styleClass, id); this.value = value; } - public GraphCell(String value, Collection styleClasses, String id) { - super(styleClasses, id); - this.value = value; - } - - public void setTableContent(GraphTable gt) { - this.table = gt; - gt.setParentElement(this); - String id = gt.getId(); - if(id == null || id.length() == 0) - gt.setId("t"); - + @Override + public ElementType getElementType() { + return ElementType.cell; } @Override @@ -84,11 +79,6 @@ public GraphTable getTableContents() { return this.table; } - @Override - public ElementType getElementType() { - return ElementType.cell; - } - @Override public String getValue() { return value; @@ -98,4 +88,13 @@ public String getValue() { public boolean isSeparator() { return false; } + + public void setTableContent(GraphTable gt) { + this.table = gt; + gt.setParentElement(this); + String id = gt.getId(); + if(id == null || id.length() == 0) + gt.setId("t"); + + } } diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphElement.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphElement.java similarity index 88% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphElement.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphElement.java index 9fc3362..6919d43 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphElement.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphElement.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; import java.util.Collections; @@ -17,13 +16,12 @@ import java.util.Map; import java.util.Set; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.IStyle; - import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.IStyle; /** * Base implementation of an IGraphElement. @@ -150,7 +148,7 @@ public String getAllStyleClasses() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.IGraphElement#getContext() + * @see com.puppetlabs.graph.IGraphElement#getContext() */ @Override public Iterator getContext() { @@ -160,7 +158,7 @@ public Iterator getContext() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.IGraphElement#getElementType() + * @see com.puppetlabs.graph.IGraphElement#getElementType() */ @Override public abstract ElementType getElementType(); diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphRow.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphRow.java similarity index 83% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphRow.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphRow.java index 64e888b..2490f31 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphRow.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphRow.java @@ -1,23 +1,22 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.ITableCell; -import org.cloudsmith.graph.ITableRow; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.ITableCell; +import com.puppetlabs.graph.ITableRow; /** * Implementation of a GraphRow. @@ -44,7 +43,7 @@ public boolean isSeparator() { * * @param styleClass */ - public GraphRow(String styleClass) { + public GraphRow(Set styleClass) { super(styleClass, null); cells = new ArrayList(1); } @@ -56,7 +55,7 @@ public GraphRow(String styleClass) { * * @param styleClass */ - public GraphRow(Set styleClass) { + public GraphRow(String styleClass) { super(styleClass, null); cells = new ArrayList(1); } diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphTable.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphTable.java similarity index 81% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphTable.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphTable.java index 241196f..b5f0e92 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/GraphTable.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/GraphTable.java @@ -1,23 +1,22 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.ITable; -import org.cloudsmith.graph.ITableRow; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.ITable; +import com.puppetlabs.graph.ITableRow; /** * An implementation of ITable. @@ -65,7 +64,7 @@ public void addRow(GraphRow row) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.GraphElement#getElementType() + * @see com.puppetlabs.graph.impl.GraphElement#getElementType() */ @Override public ElementType getElementType() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/LabeledGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/LabeledGraph.java similarity index 91% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/LabeledGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/LabeledGraph.java index 1a8fcef..00d0f13 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/LabeledGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/LabeledGraph.java @@ -1,22 +1,21 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; import java.util.Collections; import java.util.Map; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.ILabeledGraphElement; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.ILabeledGraphElement; /** * An IGraph that is also ILabeledGraphElement diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/LabeledGraphElement.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/LabeledGraphElement.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/LabeledGraphElement.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/LabeledGraphElement.java index 5a36e01..db19d41 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/LabeledGraphElement.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/LabeledGraphElement.java @@ -1,22 +1,21 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; import java.util.Collections; import java.util.Map; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.ILabeledGraphElement; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.ILabeledGraphElement; /** * diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/RootGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/RootGraph.java similarity index 78% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/RootGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/RootGraph.java index 4c02e4b..f717f27 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/RootGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/RootGraph.java @@ -1,23 +1,22 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.ISubGraph; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.ISubGraph; /** * A graph is a container of other graph elements (which include other graphs as subgraphs, vertexes and edges). diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/SubGraph.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/SubGraph.java similarity index 77% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/SubGraph.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/SubGraph.java index cae985a..3c0ecb8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/SubGraph.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/SubGraph.java @@ -1,20 +1,19 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.ISubGraph; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.ISubGraph; /** * A concrete implementation of ISubGraph. A SubGraph acts as a container with no visual bounds or appearance of diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Vertex.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Vertex.java similarity index 73% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Vertex.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Vertex.java index 8e619ec..84eedf9 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/Vertex.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/Vertex.java @@ -1,20 +1,19 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.elements; +package com.puppetlabs.graph.elements; import java.util.Collection; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IVertex; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IVertex; /** * An implementation of IVertex. @@ -40,7 +39,7 @@ public Vertex(String label, String styleClass, String id) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.GraphElement#getElementType() + * @see com.puppetlabs.graph.impl.GraphElement#getElementType() */ @Override public ElementType getElementType() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/package-info.java similarity index 66% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/elements/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/elements/package-info.java index 9335106..a954e43 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/elements/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/elements/package-info.java @@ -1,17 +1,16 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** - * This package contains an implementation of the {@link org.cloudsmith.graph.IGraph} - * and {@link org.cloudsmith.graph.IGraphElement} interfaces in the main package. + * This package contains an implementation of the {@link com.puppetlabs.graph.IGraph} + * and {@link com.puppetlabs.graph.IGraphElement} interfaces in the main package. * * The classes may serve as the basis for more specialized implementations. An implementor may * also implement the interfaces in the main package directly. @@ -19,4 +18,4 @@ * The classes in this package can be injected with * Google Guice, but can also be instantiated manually. */ -package org.cloudsmith.graph.elements; \ No newline at end of file +package com.puppetlabs.graph.elements; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/FunctionFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/FunctionFactory.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/FunctionFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/FunctionFactory.java index 75813b0..eac7652 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/FunctionFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/FunctionFactory.java @@ -1,32 +1,30 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphcss; +package com.puppetlabs.graph.graphcss; import java.io.UnsupportedEncodingException; import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.ILabeledGraphElement; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.style.labels.LabelStringTemplate; -import org.cloudsmith.graph.style.labels.LabelTable; -import org.cloudsmith.graph.utils.Base64; - import com.google.common.base.Function; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; import com.google.inject.Singleton; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.ILabeledGraphElement; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.style.labels.LabelStringTemplate; +import com.puppetlabs.graph.style.labels.LabelTable; +import com.puppetlabs.graph.utils.Base64; /** * A FunctionFactory producing values that are dynamically produced when applying a style to @@ -175,14 +173,14 @@ public String apply(IGraphElement ge) { private static class LiteralLabelTemplate implements Function { final private ILabelTemplate value; - public LiteralLabelTemplate(String value) { - this.value = new LabelStringTemplate(value); - } - public LiteralLabelTemplate(LabelTable value) { this.value = value; } + public LiteralLabelTemplate(String value) { + this.value = new LabelStringTemplate(value); + } + @Override public ILabelTemplate apply(IGraphElement from) { return value; @@ -256,7 +254,7 @@ public Boolean apply(IGraphElement ge) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#emptyLabel() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#emptyLabel() */ @Override public Function emptyLabel() { @@ -266,7 +264,7 @@ public Function emptyLabel() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#emptyLabelData(java.lang.Object) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#emptyLabelData(java.lang.Object) */ @Override public Function emptyLabelData(Object key) { @@ -281,7 +279,7 @@ public Function idClassReplacer() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#label() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#label() */ @Override public Function label() { @@ -291,7 +289,7 @@ public Function label() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#labelData(java.lang.Object) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#labelData(java.lang.Object) */ @Override public Function labelData(Object key) { @@ -301,47 +299,52 @@ public Function labelData(Object key) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#literalString(java.lang.String) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#labelTemplate(com.google.common.base.Function) */ @Override - public Function literalString(String s) { - return new LiteralString(s); + public Function labelTemplate(final Function stringFunc) { + return new Function() { + @Override + public ILabelTemplate apply(IGraphElement from) { + return new LiteralLabelTemplate(stringFunc.apply(from)).apply(from); + } + }; } /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#notEmptyLabel() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#tableStringTemplate(com.puppetlabs.graph.style.labels.LabelTable) */ @Override - public Function notEmptyLabel() { - return theNotEmptyLabelFunction; + public Function literalLabelTemplate(LabelTable t) { + return new LiteralLabelTemplate(t); } /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#notEmptyLabelData(java.lang.Object) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#literalStringTemplate(java.lang.String) */ @Override - public Function notEmptyLabelData(Object key) { - return new Not(emptyLabelData(key)); + public Function literalLabelTemplate(String s) { + return new LiteralLabelTemplate(s); } /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#literalStringSet(java.lang.String) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#literalString(java.lang.String) */ @Override - public Function> literalStringSet(String s) { - return new LiteralStringSet(Collections.singleton(s)); + public Function literalString(String s) { + return new LiteralString(s); } /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#literalStringSet(java.util.Collection) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#literalStringSet(java.util.Collection) */ @Override public Function> literalStringSet(Collection s) { @@ -351,35 +354,30 @@ public Function> literalStringSet(Collection /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#literalStringTemplate(java.lang.String) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#literalStringSet(java.lang.String) */ @Override - public Function literalLabelTemplate(String s) { - return new LiteralLabelTemplate(s); + public Function> literalStringSet(String s) { + return new LiteralStringSet(Collections.singleton(s)); } /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#tableStringTemplate(org.cloudsmith.graph.style.labels.LabelTable) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#notEmptyLabel() */ @Override - public Function literalLabelTemplate(LabelTable t) { - return new LiteralLabelTemplate(t); + public Function notEmptyLabel() { + return theNotEmptyLabelFunction; } /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#labelTemplate(com.google.common.base.Function) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#notEmptyLabelData(java.lang.Object) */ @Override - public Function labelTemplate(final Function stringFunc) { - return new Function() { - @Override - public ILabelTemplate apply(IGraphElement from) { - return new LiteralLabelTemplate(stringFunc.apply(from)).apply(from); - } - }; + public Function notEmptyLabelData(Object key) { + return new Not(emptyLabelData(key)); } } diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/GraphCSS.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/GraphCSS.java similarity index 90% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/GraphCSS.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/GraphCSS.java index d3ddcbd..153db3b 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/GraphCSS.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/GraphCSS.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphcss; +package com.puppetlabs.graph.graphcss; import java.util.ArrayList; import java.util.Collection; @@ -17,8 +16,9 @@ import java.util.Comparator; import java.util.List; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IGraphElement; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.IGraphElement; /** * A Graph CSS consists of a set of {@link Rule} describing the styling of an {@link IGraph}. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/IFunctionFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/IFunctionFactory.java similarity index 88% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/IFunctionFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/IFunctionFactory.java index ab4568c..32f7b49 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/IFunctionFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/IFunctionFactory.java @@ -1,24 +1,22 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphcss; +package com.puppetlabs.graph.graphcss; import java.util.Collection; import java.util.Set; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.style.labels.LabelTable; - import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.style.labels.LabelTable; /** * @author henrik diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/Rule.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/Rule.java similarity index 89% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/Rule.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/Rule.java index bafad34..5b0f89a 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/Rule.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/Rule.java @@ -1,18 +1,17 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphcss; +package com.puppetlabs.graph.graphcss; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.style.IStyle; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.style.IStyle; /** * A graph style rule contains a selector {@link Select.Selector} (which can be compound), and diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/Select.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/Select.java similarity index 98% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/Select.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/Select.java index e4a6f2a..12ef5cc 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/Select.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/Select.java @@ -1,28 +1,26 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphcss; +package com.puppetlabs.graph.graphcss; import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IEdge; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.style.IStyle; - import com.google.common.collect.Iterators; import com.google.common.collect.Sets; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IEdge; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.style.IStyle; /** * Style Select is used to produce a configured Selector. @@ -30,33 +28,6 @@ */ public class Select { - public static class Not extends Selector { - private Selector selector; - - public Not(Selector selector) { - this.selector = selector; - } - - @Override - public boolean equalMatch(Selector selector) { - if(!(selector instanceof Not)) - return false; - Not notSelector = (Not) selector; - return this.selector.equalMatch(notSelector.selector); - } - - @Override - public int getSpecificity() { - return this.selector.getSpecificity() + 1; - } - - @Override - public boolean matches(IGraphElement element) { - return !this.selector.matches(element); - } - - } - /** * A compound rule, where all rules must be satisfied. * @@ -370,6 +341,33 @@ public boolean matches(IGraphElement element) { } } + public static class Not extends Selector { + private Selector selector; + + public Not(Selector selector) { + this.selector = selector; + } + + @Override + public boolean equalMatch(Selector selector) { + if(!(selector instanceof Not)) + return false; + Not notSelector = (Not) selector; + return this.selector.equalMatch(notSelector.selector); + } + + @Override + public int getSpecificity() { + return this.selector.getSpecificity() + 1; + } + + @Override + public boolean matches(IGraphElement element) { + return !this.selector.matches(element); + } + + } + /** * A NullSelector is only useful in a NullRule. It matches nothing. * @@ -454,10 +452,6 @@ public static Select.And and(Select.Selector... selectors) { return new Select.And(selectors); } - public static Select.Not not(Select.Selector selector) { - return new Select.Not(selector); - } - public static Select.Element any() { return new Select.Element(ElementType.ANY); } @@ -574,6 +568,10 @@ public static Select.Instance instance(IGraphElement x) { return new Select.Instance(x); } + public static Select.Not not(Select.Selector selector) { + return new Select.Not(selector); + } + public static Select.NullSelector nullSelector() { return new Select.NullSelector(); } diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/StyleSet.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/StyleSet.java similarity index 90% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/StyleSet.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/StyleSet.java index af8dab9..7f72073 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/StyleSet.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/StyleSet.java @@ -1,26 +1,24 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphcss; +package com.puppetlabs.graph.graphcss; import java.util.Collection; import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.style.IStyle; -import org.cloudsmith.graph.style.StyleType; - import com.google.common.collect.ImmutableMap; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.style.IStyle; +import com.puppetlabs.graph.style.StyleType; /** * A set of styles. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/package-info.java similarity index 70% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/package-info.java index 3eb19cb..9031eed 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphcss/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphcss/package-info.java @@ -1,17 +1,16 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** - * This package contains a GraphCSS processor that is used when rendering {@link org.cloudsmith.graph.IGraph} graphs. + * This package contains a GraphCSS processor that is used when rendering {@link com.puppetlabs.graph.IGraph} graphs. * * The classes in the package may be injected with Google Guice, but may also be instantiated manually. */ -package org.cloudsmith.graph.graphcss; \ No newline at end of file +package com.puppetlabs.graph.graphcss; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/DefaultGraphvizConfig.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/DefaultGraphvizConfig.java similarity index 81% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/DefaultGraphvizConfig.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/DefaultGraphvizConfig.java index 5e99918..bc4c5f6 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/DefaultGraphvizConfig.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/DefaultGraphvizConfig.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; import com.google.inject.Singleton; @@ -24,7 +23,7 @@ public class DefaultGraphvizConfig implements IGraphvizConfig { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphvizConfig#getRenderer() + * @see com.puppetlabs.graph.impl.dot.IGraphvizConfig#getRenderer() */ @Override public GraphvizRenderer getRenderer() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/Graphviz.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/Graphviz.java similarity index 80% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/Graphviz.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/Graphviz.java index 9235973..b1a52f5 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/Graphviz.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/Graphviz.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -20,13 +19,13 @@ import java.util.zip.GZIPOutputStream; import org.apache.log4j.Logger; -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.dot.DotRenderer; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.utils.ByteArrayOutputStream2; import com.google.inject.Inject; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.dot.DotRenderer; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.utils.ByteArrayOutputStream2; /** * A Graphviz runner. @@ -58,7 +57,8 @@ public Graphviz(IGraphvizConfig config, DotRenderer dotRenderer) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getDotText(org.cloudsmith.graph.IGraph, org.cloudsmith.graph.impl.style.RuleSet) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getDotText(com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet) */ @Override public String getDotText(final ICancel cancel, IRootGraph graph, GraphCSS defaultCSS, GraphCSS... gCSS) { @@ -70,8 +70,9 @@ public String getDotText(final ICancel cancel, IRootGraph graph, GraphCSS defaul /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getUsemap(org.cloudsmith.graph.IGraph, org.cloudsmith.graph.impl.style.RuleSet, - * org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getUsemap(com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet, + * com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public String getUsemap(final ICancel cancel, GraphvizLayout layout, IRootGraph graph, GraphCSS defaultStyle, @@ -85,8 +86,9 @@ public String getUsemap(final ICancel cancel, GraphvizLayout layout, IRootGraph /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getJpgImage(org.cloudsmith.graph.IGraph, org.cloudsmith.graph.impl.style.RuleSet, - * org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getJpgImage(com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet, + * com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public byte[] toJPG(final ICancel cancel, GraphvizLayout layout, IRootGraph graph, GraphCSS defaultStyleSheet, @@ -104,8 +106,9 @@ public byte[] toJPG(final ICancel cancel, GraphvizLayout layout, IRootGraph grap /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getPngImage(org.cloudsmith.graph.IGraph, org.cloudsmith.graph.impl.style.RuleSet, - * org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getPngImage(com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet, + * com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public byte[] toPNG(final ICancel cancel, GraphvizLayout layout, IRootGraph graph, GraphCSS defaultStyle, @@ -123,8 +126,9 @@ public byte[] toPNG(final ICancel cancel, GraphvizLayout layout, IRootGraph grap /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getSvgImage(org.cloudsmith.graph.IGraph, org.cloudsmith.graph.impl.style.RuleSet, - * org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getSvgImage(com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet, + * com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public String toSVG(final ICancel cancel, GraphvizLayout layout, IRootGraph graph, GraphCSS defaultStyle, @@ -310,9 +314,10 @@ public void run() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getGraphvizOutput(java.io.OutputStream, org.cloudsmith.graph.impl.dot.Graphviz.Format, - * org.cloudsmith.graph.impl.dot.Graphviz.Renderer, org.cloudsmith.graph.IGraph, org.cloudsmith.graph.impl.style.RuleSet, - * org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getGraphvizOutput(java.io.OutputStream, + * com.puppetlabs.graph.impl.dot.Graphviz.Format, + * com.puppetlabs.graph.impl.dot.Graphviz.Renderer, com.puppetlabs.graph.IGraph, com.puppetlabs.graph.impl.style.RuleSet, + * com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public OutputStream writeGraphvizOutput(ICancel cancel, OutputStream output, GraphvizFormat format, @@ -329,8 +334,8 @@ public OutputStream writeGraphvizOutput(ICancel cancel, OutputStream output, Gra /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphviz.IGraphviz#writePNG(java.io.OutputStream, org.cloudsmith.graph.graphviz.GraphvizLayout, - * org.cloudsmith.graph.IRootGraph, org.cloudsmith.graph.graphcss.GraphCSS, org.cloudsmith.graph.graphcss.GraphCSS[]) + * @see com.puppetlabs.graph.graphviz.IGraphviz#writePNG(java.io.OutputStream, com.puppetlabs.graph.graphviz.GraphvizLayout, + * com.puppetlabs.graph.IRootGraph, com.puppetlabs.graph.graphcss.GraphCSS, com.puppetlabs.graph.graphcss.GraphCSS[]) */ @Override public boolean writePNG(ICancel cancel, OutputStream output, GraphvizLayout layout, IRootGraph graph, @@ -344,8 +349,8 @@ public boolean writePNG(ICancel cancel, OutputStream output, GraphvizLayout layo /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getSvgImage(java.io.OutputStream, org.cloudsmith.graph.IGraph, - * org.cloudsmith.graph.impl.style.RuleSet, org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getSvgImage(java.io.OutputStream, com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet, com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public boolean writeSVG(ICancel cancel, OutputStream output, GraphvizLayout layout, IRootGraph graph, @@ -359,8 +364,8 @@ public boolean writeSVG(ICancel cancel, OutputStream output, GraphvizLayout layo /* * (non-Javadoc) * - * @see org.cloudsmith.graph.impl.dot.IGraphviz#getSvgzImage(java.io.OutputStream, org.cloudsmith.graph.IGraph, - * org.cloudsmith.graph.impl.style.RuleSet, org.cloudsmith.graph.impl.dot.Graphviz.Layout) + * @see com.puppetlabs.graph.impl.dot.IGraphviz#getSvgzImage(java.io.OutputStream, com.puppetlabs.graph.IGraph, + * com.puppetlabs.graph.impl.style.RuleSet, com.puppetlabs.graph.impl.dot.Graphviz.Layout) */ @Override public boolean writeSVGZ(ICancel cancel, OutputStream output, GraphvizLayout layout, IRootGraph graph, diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizException.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizException.java similarity index 82% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizException.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizException.java index 48a98d8..25abcbc 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizException.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizException.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; /** * An exception indicating that the external (graphviz) executable reported problems indicating diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizFormat.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizFormat.java similarity index 88% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizFormat.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizFormat.java index e7bea5c..afa7d99 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizFormat.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizFormat.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; public enum GraphvizFormat { /** diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizLayout.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizLayout.java similarity index 78% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizLayout.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizLayout.java index 0aef46e..c4f9c48 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizLayout.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizLayout.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; /** * Layout algorithms supported by the {@link Graphviz} runner diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizRenderer.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizRenderer.java similarity index 84% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizRenderer.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizRenderer.java index 100cf78..3ad05f5 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/GraphvizRenderer.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/GraphvizRenderer.java @@ -1,15 +1,18 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; + +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.graphcss.GraphCSS; /** * The renderer an IGraphviz should use. Graphviz can use different rendering packages. The default windows installation of diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/IGraphviz.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/IGraphviz.java similarity index 97% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/IGraphviz.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/IGraphviz.java index 657d3e7..1d5ffc8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/IGraphviz.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/IGraphviz.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; import java.io.InputStream; import java.io.OutputStream; @@ -17,12 +16,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - -import org.cloudsmith.graph.ICancel; -import org.cloudsmith.graph.IRootGraph; -import org.cloudsmith.graph.graphcss.GraphCSS; +import java.util.concurrent.CancellationException; import com.google.inject.BindingAnnotation; +import com.puppetlabs.graph.ICancel; +import com.puppetlabs.graph.IRootGraph; +import com.puppetlabs.graph.graphcss.GraphCSS; /** * Interface for a graphviz runner. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/IGraphvizConfig.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/IGraphvizConfig.java similarity index 77% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/IGraphvizConfig.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/IGraphvizConfig.java index a0c6b9b..773ce79 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/IGraphvizConfig.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/IGraphvizConfig.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; - +package com.puppetlabs.graph.graphviz; import com.google.inject.ImplementedBy; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/SVGFixerOutputStream.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/SVGFixerOutputStream.java similarity index 94% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/SVGFixerOutputStream.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/SVGFixerOutputStream.java index 230d089..8b8cfc4 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/SVGFixerOutputStream.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/SVGFixerOutputStream.java @@ -1,21 +1,20 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; import java.io.IOException; import java.io.OutputStream; -import org.cloudsmith.graph.utils.Base64; -import org.cloudsmith.graph.utils.RuleFilteredOutputStream; +import com.puppetlabs.graph.utils.Base64; +import com.puppetlabs.graph.utils.RuleFilteredOutputStream; /** * An SVG stream that fixes broken and bad output from graphviz. @@ -72,7 +71,7 @@ public ReplaceIdWithIdContent() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.utils.RuleFilteredOutputStream.PatternRule#performAction() + * @see com.puppetlabs.graph.utils.RuleFilteredOutputStream.PatternRule#performAction() */ @Override protected void performAction() throws IOException { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/SVGFixerOutputStreamFilterFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/SVGFixerOutputStreamFilterFactory.java similarity index 71% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/SVGFixerOutputStreamFilterFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/SVGFixerOutputStreamFilterFactory.java index dc1ecb7..26008f3 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/SVGFixerOutputStreamFilterFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/SVGFixerOutputStreamFilterFactory.java @@ -1,19 +1,18 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.graphviz; +package com.puppetlabs.graph.graphviz; import java.io.OutputStream; -import org.cloudsmith.graph.utils.IOutputStreamFilterFactory; +import com.puppetlabs.graph.utils.IOutputStreamFilterFactory; /** * Factory that wraps the given output stream with a SVGFixerOutputStream. @@ -24,7 +23,7 @@ public class SVGFixerOutputStreamFilterFactory implements IOutputStreamFilterFac /* * (non-Javadoc) * - * @see org.cloudsmith.graph.utils.IOutputStreamFilterProvider#configureFilterFor(java.io.OutputStream) + * @see com.puppetlabs.graph.utils.IOutputStreamFilterProvider#configureFilterFor(java.io.OutputStream) */ @Override public OutputStream configureFilterFor(OutputStream out) { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/package-info.java similarity index 79% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/package-info.java index 7a2b7bc..e154d65 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/graphviz/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/graphviz/package-info.java @@ -1,17 +1,16 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** * This package contains an implementation that produces output in image and SVG formats by running * the graphviz layout tool as a separate process. The classes in this package may be injected with * Google Guice but can also be instantiated manually. */ -package org.cloudsmith.graph.graphviz; \ No newline at end of file +package com.puppetlabs.graph.graphviz; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Alignment.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Alignment.java similarity index 66% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/Alignment.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/Alignment.java index 0e41c25..443586c 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Alignment.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Alignment.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Horizontal alignment diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Arrow.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Arrow.java similarity index 96% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/Arrow.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/Arrow.java index 779cb2c..23ca895 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Arrow.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Arrow.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * An Arrow consists of either a single ArrowType (there are 36), or is a sequence of 2-4 ArrowTypes. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Compass.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Compass.java similarity index 69% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/Compass.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/Compass.java index 000d970..217dfbf 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Compass.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Compass.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Type for Compass defined port location. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/EdgeDirection.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/EdgeDirection.java similarity index 74% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/EdgeDirection.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/EdgeDirection.java index 9c8dfbe..c79984e 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/EdgeDirection.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/EdgeDirection.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Describes the direction of a edge. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/EdgeRouting.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/EdgeRouting.java similarity index 70% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/EdgeRouting.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/EdgeRouting.java index 5a2b28e..0f996cb 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/EdgeRouting.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/EdgeRouting.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Edge routing type. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyle.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyle.java similarity index 88% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyle.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyle.java index 6cbdbda..66c15ca 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyle.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyle.java @@ -1,20 +1,19 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; import java.util.Set; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IGraphElement; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IGraphElement; /** * Interface for a style. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyleFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyleFactory.java similarity index 91% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyleFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyleFactory.java index cd0f829..1179d1b 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyleFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyleFactory.java @@ -1,27 +1,25 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; import java.util.Collection; import java.util.Set; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.style.labels.LabelCell; -import org.cloudsmith.graph.style.labels.LabelRow; -import org.cloudsmith.graph.style.labels.LabelTable; - import com.google.common.base.Function; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.style.labels.LabelCell; +import com.puppetlabs.graph.style.labels.LabelRow; +import com.puppetlabs.graph.style.labels.LabelTable; /** * A Factory for style values - see {@link IStyle}. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyleVisitor.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyleVisitor.java similarity index 89% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyleVisitor.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyleVisitor.java index 9e15984..b0185cf 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/IStyleVisitor.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/IStyleVisitor.java @@ -1,18 +1,17 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.style.labels.ILabelTemplate; /** * A visitor for IStyle diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/LineBrush.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/LineBrush.java similarity index 82% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/LineBrush.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/LineBrush.java index 9a6dc44..d899ee6 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/LineBrush.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/LineBrush.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Data type describing {@link LineType} and lineWidth for edges. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/LineType.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/LineType.java similarity index 63% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/LineType.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/LineType.java index df0e559..1892fff 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/LineType.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/LineType.java @@ -1,17 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ - -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; public enum LineType { solid, dotted, dashed; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/NodeShape.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/NodeShape.java similarity index 88% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/NodeShape.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/NodeShape.java index 295b699..1c3d1f8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/NodeShape.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/NodeShape.java @@ -1,17 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ - -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; public enum NodeShape { /** rectangle */ diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/RankDirection.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/RankDirection.java similarity index 71% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/RankDirection.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/RankDirection.java index 432a0c7..e1bf15b 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/RankDirection.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/RankDirection.java @@ -1,16 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Describes if nodes at the same rank should be laid out horizontally (LR) or vertically (TB). diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/ShapeBrush.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/ShapeBrush.java similarity index 85% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/ShapeBrush.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/ShapeBrush.java index 2c43e59..a025feb 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/ShapeBrush.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/ShapeBrush.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Data type describing filled and rounded for figures that have "an area" in addition to what is diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Span.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Span.java similarity index 85% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/Span.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/Span.java index 3ba1017..713192b 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/Span.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/Span.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; /** * Data type defining span. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleFactory.java similarity index 90% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleFactory.java index 61df5ae..e9ed9db 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleFactory.java @@ -1,50 +1,48 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; - -import static org.cloudsmith.graph.ElementType.ANY; -import static org.cloudsmith.graph.ElementType.CELL; -import static org.cloudsmith.graph.ElementType.CELL_AND_TABLE_AND_VERTEX; -import static org.cloudsmith.graph.ElementType.CLUSTER_AND_GRAPH_AND_CELL_AND_TABLE; -import static org.cloudsmith.graph.ElementType.CLUSTER_AND_GRAPH_AND_CELL_AND_TABLE_AND_VERTEX; -import static org.cloudsmith.graph.ElementType.CLUSTER_AND_VERTEX; -import static org.cloudsmith.graph.ElementType.EDGE; -import static org.cloudsmith.graph.ElementType.EDGE_AND_GRAPH_AND_VERTEX; -import static org.cloudsmith.graph.ElementType.GRAPH; -import static org.cloudsmith.graph.ElementType.GRAPH_AND_VERTEX; -import static org.cloudsmith.graph.ElementType.NOT_GRAPH; -import static org.cloudsmith.graph.ElementType.NOT_SUBGRAPH; -import static org.cloudsmith.graph.ElementType.TABLE; -import static org.cloudsmith.graph.ElementType.TABLE_AND_CELL; -import static org.cloudsmith.graph.ElementType.VERTEX; +package com.puppetlabs.graph.style; + +import static com.puppetlabs.graph.ElementType.ANY; +import static com.puppetlabs.graph.ElementType.CELL; +import static com.puppetlabs.graph.ElementType.CELL_AND_TABLE_AND_VERTEX; +import static com.puppetlabs.graph.ElementType.CLUSTER_AND_GRAPH_AND_CELL_AND_TABLE; +import static com.puppetlabs.graph.ElementType.CLUSTER_AND_GRAPH_AND_CELL_AND_TABLE_AND_VERTEX; +import static com.puppetlabs.graph.ElementType.CLUSTER_AND_VERTEX; +import static com.puppetlabs.graph.ElementType.EDGE; +import static com.puppetlabs.graph.ElementType.EDGE_AND_GRAPH_AND_VERTEX; +import static com.puppetlabs.graph.ElementType.GRAPH; +import static com.puppetlabs.graph.ElementType.GRAPH_AND_VERTEX; +import static com.puppetlabs.graph.ElementType.NOT_GRAPH; +import static com.puppetlabs.graph.ElementType.NOT_SUBGRAPH; +import static com.puppetlabs.graph.ElementType.TABLE; +import static com.puppetlabs.graph.ElementType.TABLE_AND_CELL; +import static com.puppetlabs.graph.ElementType.VERTEX; import java.util.Collection; import java.util.Set; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.style.labels.DynamicLabelTemplate; -import org.cloudsmith.graph.style.labels.ILabelTemplate; -import org.cloudsmith.graph.style.labels.LabelCell; -import org.cloudsmith.graph.style.labels.LabelRow; -import org.cloudsmith.graph.style.labels.LabelStringTemplate; -import org.cloudsmith.graph.style.labels.LabelTable; - import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.style.labels.DynamicLabelTemplate; +import com.puppetlabs.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.style.labels.LabelCell; +import com.puppetlabs.graph.style.labels.LabelRow; +import com.puppetlabs.graph.style.labels.LabelStringTemplate; +import com.puppetlabs.graph.style.labels.LabelTable; /** * An IStyleFacory implementation for graphviz dot language. @@ -980,6 +978,16 @@ public LabelCell labelCell(Collection styleClasses, Function styleClass, LabelTable value) { + return new LabelCell(functions.literalStringSet(styleClass), functions.literalLabelTemplate(value)); + } + + @Override + public LabelCell labelCell(Collection styleClasses, LabelTable value, Span span) { + return new LabelCell(functions.literalStringSet(styleClasses), functions.literalLabelTemplate(value), span); + } + @Override public LabelCell labelCell(Collection styleClass, String value) { return new LabelCell( @@ -1007,11 +1015,6 @@ public LabelCell labelCell(String styleClass, Function styleClass, LabelTable value) { + public LabelCell labelCell(String styleClass, String value) { return new LabelCell(functions.literalStringSet(styleClass), functions.literalLabelTemplate(value)); } @Override - public LabelCell labelCell(Collection styleClasses, LabelTable value, Span span) { - return new LabelCell(functions.literalStringSet(styleClasses), functions.literalLabelTemplate(value), span); + public LabelCell labelCell(String styleClass, String value, Span span) { + return new LabelCell(functions.literalStringSet(styleClass), functions.literalLabelTemplate(value), span); } @Override @@ -1058,13 +1056,13 @@ public LabelStringTemplate labelStringTemplate(String x) { } @Override - public ILabelTemplate labelTemplate(Function f) { - return new DynamicLabelTemplate(f); + public LabelTable labelTable(String styleClass, LabelRow... rows) { + return new LabelTable(styleClass, rows); } @Override - public LabelTable labelTable(String styleClass, LabelRow... rows) { - return new LabelTable(styleClass, rows); + public ILabelTemplate labelTemplate(Function f) { + return new DynamicLabelTemplate(f); } @Override diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleType.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleType.java similarity index 96% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleType.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleType.java index 860ff77..753f23b 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleType.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleType.java @@ -1,15 +1,16 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; + +import com.puppetlabs.graph.style.labels.ILabelTemplate; public enum StyleType { /** Sets the text color for labels. Value is a {@link String}. */ diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleVisitor.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleVisitor.java similarity index 63% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleVisitor.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleVisitor.java index 568f722..ff20174 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/StyleVisitor.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/StyleVisitor.java @@ -1,18 +1,17 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; -import org.cloudsmith.graph.IClusterGraph; -import org.cloudsmith.graph.style.labels.ILabelTemplate; +import com.puppetlabs.graph.IClusterGraph; +import com.puppetlabs.graph.style.labels.ILabelTemplate; /** * A default implementation of IStyleVisitor. @@ -24,7 +23,7 @@ public class StyleVisitor implements IStyleVisitor { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#align(org.cloudsmith.graph.style.Alignment) + * @see com.puppetlabs.graph.style.IStyleVisitor#align(com.puppetlabs.graph.style.Alignment) */ @Override public void align(Alignment x) { @@ -35,7 +34,7 @@ public void align(Alignment x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#arrowHead(org.cloudsmith.graph.style.Arrow) + * @see com.puppetlabs.graph.style.IStyleVisitor#arrowHead(com.puppetlabs.graph.style.Arrow) */ @Override public void arrowHead(Arrow x) { @@ -46,7 +45,7 @@ public void arrowHead(Arrow x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#arrows(org.cloudsmith.graph.style.Arrow) + * @see com.puppetlabs.graph.style.IStyleVisitor#arrows(com.puppetlabs.graph.style.Arrow) */ @Override public void arrows(Arrow x) { @@ -57,7 +56,7 @@ public void arrows(Arrow x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#arrowScale(java.lang.Double) + * @see com.puppetlabs.graph.style.IStyleVisitor#arrowScale(java.lang.Double) */ @Override public void arrowScale(double x) { @@ -68,7 +67,7 @@ public void arrowScale(double x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#arrowTail(org.cloudsmith.graph.style.Arrow) + * @see com.puppetlabs.graph.style.IStyleVisitor#arrowTail(com.puppetlabs.graph.style.Arrow) */ @Override public void arrowTail(Arrow x) { @@ -79,7 +78,7 @@ public void arrowTail(Arrow x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#backgroundColor(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#backgroundColor(java.lang.String) */ @Override public void backgroundColor(String x) { @@ -90,7 +89,7 @@ public void backgroundColor(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#borderWidth(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#borderWidth(int) */ @Override public void borderWidth(int x) { @@ -101,7 +100,7 @@ public void borderWidth(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#cellBorderWidth(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#cellBorderWidth(int) */ @Override public void cellBorderWidth(int x) { @@ -112,7 +111,7 @@ public void cellBorderWidth(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#cellPadding(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#cellPadding(int) */ @Override public void cellPadding(int x) { @@ -123,7 +122,7 @@ public void cellPadding(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#cellSpacing(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#cellSpacing(int) */ @Override public void cellSpacing(int x) { @@ -134,7 +133,7 @@ public void cellSpacing(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#color(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#color(java.lang.String) */ @Override public void color(String x) { @@ -145,7 +144,7 @@ public void color(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#colSpan(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#colSpan(int) */ @Override public void colSpan(int x) { @@ -156,7 +155,7 @@ public void colSpan(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#compound(boolean) + * @see com.puppetlabs.graph.style.IStyleVisitor#compound(boolean) */ @Override public void compound(boolean value) { @@ -167,7 +166,7 @@ public void compound(boolean value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#concentrate(boolean) + * @see com.puppetlabs.graph.style.IStyleVisitor#concentrate(boolean) */ @Override public void concentrate(boolean x) { @@ -178,7 +177,7 @@ public void concentrate(boolean x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#decorate(boolean) + * @see com.puppetlabs.graph.style.IStyleVisitor#decorate(boolean) */ @Override public void decorate(boolean x) { @@ -189,7 +188,7 @@ public void decorate(boolean x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#direction(org.cloudsmith.graph.style.EdgeDirection) + * @see com.puppetlabs.graph.style.IStyleVisitor#direction(com.puppetlabs.graph.style.EdgeDirection) */ @Override public void direction(EdgeDirection x) { @@ -200,7 +199,7 @@ public void direction(EdgeDirection x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#backgroundColor(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#backgroundColor(java.lang.String) */ @Override public void fillColor(String x) { @@ -211,7 +210,7 @@ public void fillColor(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#fixedSize(boolean) + * @see com.puppetlabs.graph.style.IStyleVisitor#fixedSize(boolean) */ @Override public void fixedSize(boolean x) { @@ -222,7 +221,7 @@ public void fixedSize(boolean x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#fontFamily(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#fontFamily(java.lang.String) */ @Override public void fontFamily(String x) { @@ -233,7 +232,7 @@ public void fontFamily(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#fontSize(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#fontSize(int) */ @Override public void fontSize(int x) { @@ -244,7 +243,7 @@ public void fontSize(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#fromCluster(org.cloudsmith.graph.IClusterGraph) + * @see com.puppetlabs.graph.style.IStyleVisitor#fromCluster(com.puppetlabs.graph.IClusterGraph) */ @Override public void fromCluster(IClusterGraph value) { @@ -255,7 +254,7 @@ public void fromCluster(IClusterGraph value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#headPort(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#headPort(java.lang.String) */ @Override public void headPort(String x) { @@ -266,7 +265,7 @@ public void headPort(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#height(double) + * @see com.puppetlabs.graph.style.IStyleVisitor#height(double) */ @Override public void height(double d) { @@ -277,7 +276,7 @@ public void height(double d) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#href(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#href(java.lang.String) */ @Override public void href(String x) { @@ -288,7 +287,7 @@ public void href(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#id(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#id(java.lang.String) */ @Override public void id(String value) { @@ -298,7 +297,7 @@ public void id(String value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#labelFormat(org.cloudsmith.graph.style.labels.ILabelTemplate) + * @see com.puppetlabs.graph.style.IStyleVisitor#labelFormat(com.puppetlabs.graph.style.labels.ILabelTemplate) */ @Override public void labelFormat(ILabelTemplate x) { @@ -309,7 +308,7 @@ public void labelFormat(ILabelTemplate x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#lineBrush(org.cloudsmith.graph.style.LineType, double) + * @see com.puppetlabs.graph.style.IStyleVisitor#lineBrush(com.puppetlabs.graph.style.LineType, double) */ @Override public void lineBrush(LineBrush brush) { @@ -320,7 +319,7 @@ public void lineBrush(LineBrush brush) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#lineColor(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#lineColor(java.lang.String) */ @Override public void lineColor(String x) { @@ -330,7 +329,7 @@ public void lineColor(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#mclimit(double) + * @see com.puppetlabs.graph.style.IStyleVisitor#mclimit(double) */ @Override public void mclimit(double value) { @@ -341,7 +340,7 @@ public void mclimit(double value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#port(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#port(java.lang.String) */ @Override public void port(String x) { @@ -352,7 +351,7 @@ public void port(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#rankDirectionStyle(org.cloudsmith.graph.style.RankDirection) + * @see com.puppetlabs.graph.style.IStyleVisitor#rankDirectionStyle(com.puppetlabs.graph.style.RankDirection) */ @Override public void rankDirection(RankDirection x) { @@ -363,7 +362,7 @@ public void rankDirection(RankDirection x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#rankSeparation(double) + * @see com.puppetlabs.graph.style.IStyleVisitor#rankSeparation(double) */ @Override public void rankSeparation(double x) { @@ -374,7 +373,7 @@ public void rankSeparation(double x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#remincross(boolean) + * @see com.puppetlabs.graph.style.IStyleVisitor#remincross(boolean) */ @Override public void remincross(boolean value) { @@ -385,7 +384,7 @@ public void remincross(boolean value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#rendered(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#rendered(java.lang.String) */ @Override public void rendered(boolean x) { @@ -396,7 +395,7 @@ public void rendered(boolean x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#routing(org.cloudsmith.graph.style.EdgeRouting) + * @see com.puppetlabs.graph.style.IStyleVisitor#routing(com.puppetlabs.graph.style.EdgeRouting) */ @Override public void routing(EdgeRouting x) { @@ -407,7 +406,7 @@ public void routing(EdgeRouting x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#rowSpan(int) + * @see com.puppetlabs.graph.style.IStyleVisitor#rowSpan(int) */ @Override public void rowSpan(int x) { @@ -418,7 +417,7 @@ public void rowSpan(int x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#shape(org.cloudsmith.graph.style.NodeShape) + * @see com.puppetlabs.graph.style.IStyleVisitor#shape(com.puppetlabs.graph.style.NodeShape) */ @Override public void shape(NodeShape x) { @@ -429,7 +428,7 @@ public void shape(NodeShape x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#shapeBrush(org.cloudsmith.graph.style.ShapeBrush) + * @see com.puppetlabs.graph.style.IStyleVisitor#shapeBrush(com.puppetlabs.graph.style.ShapeBrush) */ @Override public void shapeBrush(ShapeBrush brush) { @@ -440,7 +439,7 @@ public void shapeBrush(ShapeBrush brush) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#tailPort(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#tailPort(java.lang.String) */ @Override public void tailPort(String x) { @@ -451,7 +450,7 @@ public void tailPort(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#target(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#target(java.lang.String) */ @Override public void target(String x) { @@ -462,7 +461,7 @@ public void target(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#toCluster(org.cloudsmith.graph.IClusterGraph) + * @see com.puppetlabs.graph.style.IStyleVisitor#toCluster(com.puppetlabs.graph.IClusterGraph) */ @Override public void toCluster(IClusterGraph value) { @@ -473,7 +472,7 @@ public void toCluster(IClusterGraph value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#tooltip(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#tooltip(java.lang.String) */ @Override public void tooltip(String x) { @@ -484,7 +483,7 @@ public void tooltip(String x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#tooltipForHead(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#tooltipForHead(java.lang.String) */ @Override public void tooltipForHead(String value) { @@ -495,7 +494,7 @@ public void tooltipForHead(String value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#tooltipForLabel(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#tooltipForLabel(java.lang.String) */ @Override public void tooltipForLabel(String value) { @@ -506,7 +505,7 @@ public void tooltipForLabel(String value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#tooltipForTail(java.lang.String) + * @see com.puppetlabs.graph.style.IStyleVisitor#tooltipForTail(java.lang.String) */ @Override public void tooltipForTail(String value) { @@ -518,7 +517,7 @@ public void tooltipForTail(String value) { * This implementation does nothing. A derived class can implement this method as a "catch all" for * unimplemented methods. * - * @see org.cloudsmith.graph.style.IStyleVisitor#unsupported(org.cloudsmith.graph.IStyle) + * @see com.puppetlabs.graph.style.IStyleVisitor#unsupported(com.puppetlabs.graph.IStyle) */ protected void unsupported(StyleType style) { // does nothing @@ -527,7 +526,7 @@ protected void unsupported(StyleType style) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#verticalAlign(org.cloudsmith.graph.style.VerticalAlignment) + * @see com.puppetlabs.graph.style.IStyleVisitor#verticalAlign(com.puppetlabs.graph.style.VerticalAlignment) */ @Override public void verticalAlign(VerticalAlignment x) { @@ -538,7 +537,7 @@ public void verticalAlign(VerticalAlignment x) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#weight(java.lang.Double) + * @see com.puppetlabs.graph.style.IStyleVisitor#weight(java.lang.Double) */ @Override public void weight(double value) { @@ -548,7 +547,7 @@ public void weight(double value) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.IStyleVisitor#width(double) + * @see com.puppetlabs.graph.style.IStyleVisitor#width(double) */ @Override public void width(double x) { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/VerticalAlignment.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/VerticalAlignment.java similarity index 64% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/VerticalAlignment.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/VerticalAlignment.java index c1d01b7..6ea7447 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/VerticalAlignment.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/VerticalAlignment.java @@ -1,17 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * AT&T - initial API - * Cloudsmith - * + * Puppet Labs */ - -package org.cloudsmith.graph.style; +package com.puppetlabs.graph.style; public enum VerticalAlignment { top, middle, bottom; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/DynamicLabelTemplate.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/DynamicLabelTemplate.java similarity index 81% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/DynamicLabelTemplate.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/DynamicLabelTemplate.java index 553edb2..f3c96b8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/DynamicLabelTemplate.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/DynamicLabelTemplate.java @@ -1,19 +1,17 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; - -import org.cloudsmith.graph.IGraphElement; +package com.puppetlabs.graph.style.labels; import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; /** * A dynamic/indirect way to obtain a label template. Useful when not knowing until data is seen if it diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/ILabelTemplate.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/ILabelTemplate.java similarity index 72% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/ILabelTemplate.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/ILabelTemplate.java index 927004e..6dfe9b8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/ILabelTemplate.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/ILabelTemplate.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; +package com.puppetlabs.graph.style.labels; /** * Marker interface for things that can act as labels. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelCell.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelCell.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelCell.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelCell.java index 5af643a..ab0e958 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelCell.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelCell.java @@ -1,24 +1,22 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; +package com.puppetlabs.graph.style.labels; import java.util.Set; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.IStyle; -import org.cloudsmith.graph.style.Span; - import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.IStyle; +import com.puppetlabs.graph.style.Span; /** * Data for label format. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelMatrix.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelMatrix.java similarity index 90% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelMatrix.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelMatrix.java index 2a0c43b..ed57d50 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelMatrix.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelMatrix.java @@ -1,19 +1,17 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; - -import org.cloudsmith.graph.IGraphElement; +package com.puppetlabs.graph.style.labels; import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; /** * A Label Matrix provides a 2 dimensional label template useful for rendering diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelRow.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelRow.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelRow.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelRow.java index 86bd285..11a7e57 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelRow.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelRow.java @@ -1,22 +1,20 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; +package com.puppetlabs.graph.style.labels; import java.util.Collections; import java.util.Set; -import org.cloudsmith.graph.IGraphElement; - import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; /** * Data for label format diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelStringTemplate.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelStringTemplate.java similarity index 81% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelStringTemplate.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelStringTemplate.java index 21e485e..f55a9a2 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelStringTemplate.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelStringTemplate.java @@ -1,19 +1,17 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; - -import org.cloudsmith.graph.IGraphElement; +package com.puppetlabs.graph.style.labels; import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; public class LabelStringTemplate implements ILabelTemplate { private Function templateString; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelTable.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelTable.java similarity index 85% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelTable.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelTable.java index 7859b4a..b42f643 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelTable.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelTable.java @@ -1,22 +1,20 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; +package com.puppetlabs.graph.style.labels; import java.util.Collections; import java.util.Set; -import org.cloudsmith.graph.IGraphElement; - import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; /** * Data for label format diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelTableBuilder.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelTableBuilder.java similarity index 84% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelTableBuilder.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelTableBuilder.java index 8d8fb3d..4616d1f 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/LabelTableBuilder.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/LabelTableBuilder.java @@ -1,24 +1,22 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.labels; +package com.puppetlabs.graph.style.labels; import java.util.Collection; import java.util.Set; -import org.cloudsmith.graph.IGraphElement; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.style.IStyleFactory; - import com.google.common.base.Function; +import com.puppetlabs.graph.IGraphElement; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.style.IStyleFactory; /** * A helper class that makes it easier/more readable to build a label table. @@ -72,7 +70,7 @@ final protected LabelCell cell(String styleClass, String s) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#emptyLabel() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#emptyLabel() */ @Override public Function emptyLabel() { @@ -82,7 +80,7 @@ public Function emptyLabel() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#emptyLabelData(java.lang.Object) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#emptyLabelData(java.lang.Object) */ @Override public Function emptyLabelData(Object key) { @@ -93,7 +91,7 @@ public Function emptyLabelData(Object key) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#idClassReplacer() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#idClassReplacer() */ @Override public Function idClassReplacer() { @@ -104,7 +102,7 @@ public Function idClassReplacer() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#label() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#label() */ @Override public Function label() { @@ -115,7 +113,7 @@ public Function label() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#labelData(java.lang.Object) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#labelData(java.lang.Object) */ @Override public Function labelData(Object key) { @@ -125,7 +123,7 @@ public Function labelData(Object key) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#labelTemplate(com.google.common.base.Function) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#labelTemplate(com.google.common.base.Function) */ @Override public Function labelTemplate(Function stringFunc) { @@ -145,7 +143,7 @@ public Function literalLabelTemplate(String s) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#literalString(java.lang.String) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#literalString(java.lang.String) */ @Override public Function literalString(String s) { @@ -165,7 +163,7 @@ public Function> literalStringSet(String s) { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#notEmptyLabel() + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#notEmptyLabel() */ @Override public Function notEmptyLabel() { @@ -175,7 +173,7 @@ public Function notEmptyLabel() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.graphcss.IFunctionFactory#notEmptyLabelData(java.lang.Object) + * @see com.puppetlabs.graph.graphcss.IFunctionFactory#notEmptyLabelData(java.lang.Object) */ @Override public Function notEmptyLabelData(Object key) { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/package-info.java similarity index 70% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/package-info.java index 5a5c742..ecb9bab 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/labels/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/labels/package-info.java @@ -1,15 +1,14 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** * This package contains an implementation of label templates. */ -package org.cloudsmith.graph.style.labels; \ No newline at end of file +package com.puppetlabs.graph.style.labels; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/package-info.java similarity index 63% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/package-info.java index 1e5a0d5..0dcfcf8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/package-info.java @@ -1,21 +1,20 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** - * This package contains an implementation that describes the style of {@link org.cloudsmith.graph.IGraph} graphs. + * This package contains an implementation that describes the style of {@link com.puppetlabs.graph.IGraph} graphs. * - * The main interface is the {@link org.cloudsmith.graph.style.IStyleFactory} which should be used to - * obtain styles. The {@link org.cloudsmith.graph.style.StyleFactory} is a default implementation of + * The main interface is the {@link com.puppetlabs.graph.style.IStyleFactory} which should be used to + * obtain styles. The {@link com.puppetlabs.graph.style.StyleFactory} is a default implementation of * this interface. * * The classes in the package may be injected with Google Guice, but may also be instantiated manually. */ -package org.cloudsmith.graph.style; \ No newline at end of file +package com.puppetlabs.graph.style; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/DefaultStyleTheme.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/DefaultStyleTheme.java similarity index 85% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/DefaultStyleTheme.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/DefaultStyleTheme.java index 5b82b4b..7d60eb9 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/DefaultStyleTheme.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/DefaultStyleTheme.java @@ -1,37 +1,35 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.themes; +package com.puppetlabs.graph.style.themes; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import org.cloudsmith.graph.ElementType; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.IFunctionFactory; -import org.cloudsmith.graph.graphcss.Rule; -import org.cloudsmith.graph.graphcss.Select; -import org.cloudsmith.graph.graphcss.StyleSet; -import org.cloudsmith.graph.style.Alignment; -import org.cloudsmith.graph.style.Arrow; -import org.cloudsmith.graph.style.EdgeDirection; -import org.cloudsmith.graph.style.IStyleFactory; -import org.cloudsmith.graph.style.LineType; -import org.cloudsmith.graph.style.NodeShape; -import org.cloudsmith.graph.style.VerticalAlignment; - import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.puppetlabs.graph.ElementType; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.IFunctionFactory; +import com.puppetlabs.graph.graphcss.Rule; +import com.puppetlabs.graph.graphcss.Select; +import com.puppetlabs.graph.graphcss.StyleSet; +import com.puppetlabs.graph.style.Alignment; +import com.puppetlabs.graph.style.Arrow; +import com.puppetlabs.graph.style.EdgeDirection; +import com.puppetlabs.graph.style.IStyleFactory; +import com.puppetlabs.graph.style.LineType; +import com.puppetlabs.graph.style.NodeShape; +import com.puppetlabs.graph.style.VerticalAlignment; /** * Definition of useful default styles and rules. @@ -72,7 +70,7 @@ public class DefaultStyleTheme implements IStyleTheme { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.themes.IStyleTheme#defaultFontFamily() + * @see com.puppetlabs.graph.style.themes.IStyleTheme#defaultFontFamily() */ @Override public String defaultFontFamily() { @@ -82,7 +80,7 @@ public String defaultFontFamily() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.themes.IStyleTheme#defaultPointSize() + * @see com.puppetlabs.graph.style.themes.IStyleTheme#defaultPointSize() */ @Override public int defaultPointSize() { @@ -92,7 +90,7 @@ public int defaultPointSize() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.themes.IStyleTheme#getDefaultRules() + * @see com.puppetlabs.graph.style.themes.IStyleTheme#getDefaultRules() */ @Override public GraphCSS getDefaultRules() { @@ -153,7 +151,7 @@ public GraphCSS getDefaultRules() { /* * (non-Javadoc) * - * @see org.cloudsmith.graph.style.themes.IStyleTheme#getInstanceRules() + * @see com.puppetlabs.graph.style.themes.IStyleTheme#getInstanceRules() */ @Override public Collection getInstanceRules() { diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/IStyleTheme.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/IStyleTheme.java similarity index 84% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/IStyleTheme.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/IStyleTheme.java index a6ea657..85155bc 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/IStyleTheme.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/IStyleTheme.java @@ -1,22 +1,20 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.style.themes; +package com.puppetlabs.graph.style.themes; import java.util.Collection; -import org.cloudsmith.graph.graphcss.GraphCSS; -import org.cloudsmith.graph.graphcss.Rule; - import com.google.inject.ImplementedBy; +import com.puppetlabs.graph.graphcss.GraphCSS; +import com.puppetlabs.graph.graphcss.Rule; /** * Interface for a style theme. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/package-info.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/package-info.java similarity index 69% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/package-info.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/package-info.java index c30cf5b..12eaaf8 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/style/themes/package-info.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/style/themes/package-info.java @@ -1,15 +1,14 @@ /* - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ /** * This package contains styling 'themes'. */ -package org.cloudsmith.graph.style.themes; \ No newline at end of file +package com.puppetlabs.graph.style.themes; \ No newline at end of file diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/Base64.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/Base64.java similarity index 97% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/Base64.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/Base64.java index 62f995e..02cd8e1 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/Base64.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/Base64.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; /** * Simple Base64 encoder/decoder as specified by RFC2045 - using standard base64 encoding (letters, digits diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/ByteArrayOutputStream2.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/ByteArrayOutputStream2.java similarity index 89% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/ByteArrayOutputStream2.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/ByteArrayOutputStream2.java index 4fdcd1d..bfc9075 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/ByteArrayOutputStream2.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/ByteArrayOutputStream2.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/CircularByteQueue.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/CircularByteQueue.java similarity index 98% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/CircularByteQueue.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/CircularByteQueue.java index e0919ae..bea47fc 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/CircularByteQueue.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/CircularByteQueue.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; /** * @author henrik diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/Counter.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/Counter.java similarity index 86% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/Counter.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/Counter.java index eeb251f..c06ebbd 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/Counter.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/Counter.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; /** * A counter that is useful when a final int is not working... diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/GraphToGraphML.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/GraphToGraphML.java similarity index 91% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/GraphToGraphML.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/GraphToGraphML.java index 2db3948..e109faf 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/GraphToGraphML.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/GraphToGraphML.java @@ -1,23 +1,22 @@ /** - * Copyright (c) 2005-2007 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; import java.io.OutputStream; import java.io.PrintStream; -import org.cloudsmith.graph.IEdge; -import org.cloudsmith.graph.IGraph; -import org.cloudsmith.graph.IVertex; -import org.cloudsmith.graph.style.StyleType; +import com.puppetlabs.graph.IEdge; +import com.puppetlabs.graph.IGraph; +import com.puppetlabs.graph.IVertex; +import com.puppetlabs.graph.style.StyleType; /** * Produces GraphML output from a Graph instance. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/IOutputStreamFilterFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/IOutputStreamFilterFactory.java similarity index 87% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/IOutputStreamFilterFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/IOutputStreamFilterFactory.java index 4765e95..6cbea3d 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/IOutputStreamFilterFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/IOutputStreamFilterFactory.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; import java.io.IOException; import java.io.OutputStream; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/ImageUtils.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/ImageUtils.java similarity index 95% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/ImageUtils.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/ImageUtils.java index 7e0bb61..2cdb993 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/ImageUtils.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/ImageUtils.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2006-2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; import java.awt.Color; import java.awt.Graphics2D; diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/RuleFilteredOutputStream.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/RuleFilteredOutputStream.java similarity index 90% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/RuleFilteredOutputStream.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/RuleFilteredOutputStream.java index 428cfab..4412c3a 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/RuleFilteredOutputStream.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/RuleFilteredOutputStream.java @@ -1,4 +1,14 @@ -package org.cloudsmith.graph.utils; +/** + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Puppet Labs + */ +package com.puppetlabs.graph.utils; import java.io.FilterOutputStream; import java.io.IOException; @@ -252,9 +262,10 @@ public int compare(PatternRule o1, PatternRule o2) { * starting at offset off to this buffered output stream. * *

- * Ordinarily this method stores bytes from the given array into this stream's buffer, flushing the buffer to the underlying output stream as - * needed. If the requested length is at least as large as this stream's buffer, however, then this method will flush the buffer and write the - * bytes directly to the underlying output stream. Thus redundant BufferedOutputStreams will not copy data unnecessarily. + * Ordinarily this method stores bytes from the given array into this stream's buffer, flushing the buffer to the underlying + * output stream as needed. If the requested length is at least as large as this stream's buffer, however, then this method + * will flush the buffer and write the bytes directly to the underlying output stream. Thus redundant + * BufferedOutputStreams will not copy data unnecessarily. * * @param b * the data. diff --git a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/TransparentOutputStreamFilterFactory.java b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/TransparentOutputStreamFilterFactory.java similarity index 78% rename from org.cloudsmith.graph/src/org/cloudsmith/graph/utils/TransparentOutputStreamFilterFactory.java rename to com.puppetlabs.graph/src/com/puppetlabs/graph/utils/TransparentOutputStreamFilterFactory.java index 18be3ca..4970045 100644 --- a/org.cloudsmith.graph/src/org/cloudsmith/graph/utils/TransparentOutputStreamFilterFactory.java +++ b/com.puppetlabs.graph/src/com/puppetlabs/graph/utils/TransparentOutputStreamFilterFactory.java @@ -1,15 +1,14 @@ /** - * Copyright (c) 2011 Cloudsmith Inc. and other contributors, as listed below. + * Copyright (c) 2013 Puppet Labs, Inc. and other contributors, as listed below. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Cloudsmith - * + * Puppet Labs */ -package org.cloudsmith.graph.utils; +package com.puppetlabs.graph.utils; import java.io.OutputStream; @@ -23,7 +22,7 @@ public class TransparentOutputStreamFilterFactory implements IOutputStreamFilter /* * (non-Javadoc) * - * @see org.cloudsmith.graph.utils.IOutputStreamFilterProvider#configureFilterFor(java.io.OutputStream) + * @see com.puppetlabs.graph.utils.IOutputStreamFilterProvider#configureFilterFor(java.io.OutputStream) */ @Override public OutputStream configureFilterFor(OutputStream out) { diff --git a/pom.xml b/pom.xml index 0e4ca2b..642906c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ 4.0.0 - org.cloudsmith.graph + com.puppetlabs.graph parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT pom Graph Site Project @@ -27,34 +27,35 @@ scm:git:git://github.com/cloudsmith/grahp.git https://github.com/cloudsmith/graph scm:git:git@github.com:cloudsmith/graph.git - + HEAD + - cloudsmith - Cloudsmith Release Repository - https://am0.cloudsmith.com/nexus/content/repositories/releases/ + puppetlabs + Puppet Labs Release Repository + http://nexus.delivery.puppetlabs.net/content/repositories/releases/ - cloudsmith-snapshots - Cloudsmith Snapshot Repository - https://am0.cloudsmith.com/nexus/content/repositories/snapshots/ + puppetlabs + Puppet Labs Snapshot Repository + http://nexus.delivery.puppetlabs.net/content/repositories/snapshots/ - cloudsmith-snapshots - Cloudsmith Snapshot Repository - https://am0.cloudsmith.com/nexus/content/repositories/snapshots + puppetlabs-snapshots + Puppet Labs Snapshot Repository + http://nexus.delivery.puppetlabs.net/content/repositories/snapshots/ true - cloudsmith-releases - Cloudsmith Releases - https://am0.cloudsmith.com/nexus/content/repositories/releases + puppetlabs-releases + Puppet Labs Releases + http://nexus.delivery.puppetlabs.net/content/repositories/releases/ false @@ -63,9 +64,9 @@ - cloudsmith-snapshots - Cloudsmith Snapshot Repository - https://am0.cloudsmith.com/nexus/content/repositories/snapshots + puppetlabs-snapshots + Puppet Labs Snapshot Repository + http://nexus.delivery.puppetlabs.net/content/repositories/snapshots/ true @@ -137,6 +138,6 @@ - org.cloudsmith.graph + com.puppetlabs.graph