diff options
author | Noel Grandin <noel@peralex.com> | 2012-09-03 14:04:31 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-05 21:01:48 +0200 |
commit | cd0308ba9c284d6ed336955e758a689bd8028a96 (patch) | |
tree | a89b7e290dbc7f87092715807089bc6b5e9193ed /odk/examples | |
parent | 39b6fc96fcd8e59431eb12d0abb0305121b8a84d (diff) |
Java cleanup, make package name match folder name
Change-Id: I4d472f088a370ea99beb621d1b1fd722a9f6f144
Diffstat (limited to 'odk/examples')
5 files changed, 2 insertions, 14 deletions
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java index efa1b8f96f35..e75d1eec3f4e 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java @@ -16,8 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package org.openoffice.examples.embedding; - import java.awt.*; import java.awt.event.*; import java.awt.image.*; @@ -26,8 +24,6 @@ import javax.swing.JFrame; import java.io.*; import javax.imageio.ImageIO; -import org.openoffice.examples.embedding.OwnEmbeddedObject; - public class EditorFrame extends JFrame { OwnEmbeddedObject m_aEmbObj; diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile b/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile index 62fb17e5e0ac..59e71869b0fe 100755 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile @@ -59,7 +59,7 @@ COMP_UNOPKG_MANIFEST = $(COMP_GEN_OUT)/META-INF/manifest.xml COMP_REGISTERFLAG=$(COMP_GEN_OUT)$(PS)java_$(COMP_NAME)_register_component.flag COMP_COMPONENTS=$(COMP_NAME).components -PACKAGE = org/openoffice/examples/embedding +PACKAGE = COMP_JAVAFILES =\ OwnEmbeddedObject.java\ diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components index 421706f7418f..a77b099e065f 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <components xmlns="http://openoffice.org/2010/uno-components"> <component loader="com.sun.star.loader.Java2" uri="OwnEmbeddedObject.uno.jar"> - <implementation name="org.openoffice.examples.embedding.OwnEmbeddedObjectFactory"> + <implementation name="OwnEmbeddedObjectFactory"> <service name="org.openoffice.examples.embedding.Factory69474366FD6F480683748EDD1B6E771D"/> </implementation> </component> diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java index cdf666610340..5ebb009fc9b1 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java @@ -16,8 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package org.openoffice.examples.embedding; - import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.lang.XMultiComponentFactory; @@ -42,8 +40,6 @@ import java.awt.Dimension; import java.lang.Integer; import org.omg.CORBA.COMM_FAILURE; -import org.openoffice.examples.embedding.EditorFrame; - public final class OwnEmbeddedObject extends WeakBase implements com.sun.star.embed.XEmbedPersist, com.sun.star.embed.XEmbeddedObject diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java index 882bc594b30b..721703a2a755 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java @@ -16,8 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package org.openoffice.examples.embedding; - import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.lib.uno.helper.Factory; @@ -29,8 +27,6 @@ import com.sun.star.lang.IllegalArgumentException; import com.sun.star.embed.*; -import org.openoffice.examples.embedding.OwnEmbeddedObject; - public final class OwnEmbeddedObjectFactory extends WeakBase implements com.sun.star.lang.XServiceInfo, com.sun.star.embed.XEmbedObjectFactory |