summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2009-01-07 10:56:17 (EST)
committerCarsten Drossel2009-01-07 10:56:17 (EST)
commit9adf5850eebf2998cf1647c179b2226d149419ef (patch)
treeb0ccc0a0d9cab1df78b88f6b5a5cd35704cdddf1
parent7cc7c1bc10443db9d70effa3cfca1170b031cb23 (diff)
downloadorg.eclipse.riena-9adf5850eebf2998cf1647c179b2226d149419ef.zip
org.eclipse.riena-9adf5850eebf2998cf1647c179b2226d149419ef.tar.gz
org.eclipse.riena-9adf5850eebf2998cf1647c179b2226d149419ef.tar.bz2
fixed package structure: classes IconSize and IconState used by other bundles were in a package named 'internal'
-rw-r--r--org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/NavigationNodeController.java2
-rw-r--r--org.eclipse.riena.ui.core/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.riena.ui.core/src/org/eclipse/riena/internal/ui/core/resource/IconManager.java (renamed from org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconManager.java)10
-rw-r--r--org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IIconManager.java2
-rw-r--r--org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconManagerAccessor.java2
-rw-r--r--org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconSize.java (renamed from org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconSize.java)2
-rw-r--r--org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconState.java (renamed from org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconState.java)2
7 files changed, 10 insertions, 11 deletions
diff --git a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/NavigationNodeController.java b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/NavigationNodeController.java
index 7456f3c..f48504c 100644
--- a/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/NavigationNodeController.java
+++ b/org.eclipse.riena.navigation.ui/src/org/eclipse/riena/navigation/ui/controllers/NavigationNodeController.java
@@ -28,7 +28,7 @@ import org.eclipse.riena.ui.core.marker.ErrorMarker;
import org.eclipse.riena.ui.core.marker.MandatoryMarker;
import org.eclipse.riena.ui.core.resource.IIconManager;
import org.eclipse.riena.ui.core.resource.IconManagerAccessor;
-import org.eclipse.riena.ui.core.resource.internal.IconSize;
+import org.eclipse.riena.ui.core.resource.IconSize;
import org.eclipse.riena.ui.ridgets.IMarkableRidget;
import org.eclipse.riena.ui.ridgets.IRidget;
import org.eclipse.riena.ui.ridgets.IRidgetContainer;
diff --git a/org.eclipse.riena.ui.core/META-INF/MANIFEST.MF b/org.eclipse.riena.ui.core/META-INF/MANIFEST.MF
index 3bbc4ec..8b25ab6 100644
--- a/org.eclipse.riena.ui.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.ui.core/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.riena.ui.core.marker,
org.eclipse.riena.ui.core.resource,
- org.eclipse.riena.ui.core.resource.internal,
org.eclipse.riena.ui.core.uiprocess,
org.eclipse.riena.ui.core.util
Import-Package: org.osgi.service.log;version="1.3.0"
diff --git a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconManager.java b/org.eclipse.riena.ui.core/src/org/eclipse/riena/internal/ui/core/resource/IconManager.java
index d683180..dad9198 100644
--- a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconManager.java
+++ b/org.eclipse.riena.ui.core/src/org/eclipse/riena/internal/ui/core/resource/IconManager.java
@@ -8,12 +8,14 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.ui.core.resource.internal;
+package org.eclipse.riena.internal.ui.core.resource;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.riena.ui.core.resource.IIconManager;
+import org.eclipse.riena.ui.core.resource.IconSize;
+import org.eclipse.riena.ui.core.resource.IconState;
/**
* Maintains the icons used by the application.
@@ -33,7 +35,7 @@ public final class IconManager implements IIconManager {
/**
* @see org.eclipse.riena.ui.core.resource#getIconID(java.lang.String,
- * org.eclipse.riena.ui.core.resource.internal.IconSize)
+ * org.eclipse.riena.ui.core.resource.IconSize)
*/
public String getIconID(String name, IconSize size) {
@@ -42,8 +44,8 @@ public final class IconManager implements IIconManager {
/**
* @see org.eclipse.riena.ui.core.resource#getIconID(java.lang.String,
- * org.eclipse.riena.ui.core.resource.internal.IconSize,
- * org.eclipse.riena.ui.core.resource.internal.IconState)
+ * org.eclipse.riena.ui.core.resource.IconSize,
+ * org.eclipse.riena.ui.core.resource.IconState)
*/
public String getIconID(String name, IconSize size, IconState state) {
diff --git a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IIconManager.java b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IIconManager.java
index e417d1d..14bd3cc 100644
--- a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IIconManager.java
+++ b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IIconManager.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.riena.ui.core.resource;
-import org.eclipse.riena.ui.core.resource.internal.IconSize;
-import org.eclipse.riena.ui.core.resource.internal.IconState;
/**
* Describes how the icons of the application are maintained. Icons are
diff --git a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconManagerAccessor.java b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconManagerAccessor.java
index 14b184c..840bad2 100644
--- a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconManagerAccessor.java
+++ b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconManagerAccessor.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.riena.ui.core.resource;
-import org.eclipse.riena.ui.core.resource.internal.IconManager;
+import org.eclipse.riena.internal.ui.core.resource.IconManager;
/**
* Retrieves the implementation of <code>IIconManager</code>.
diff --git a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconSize.java b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconSize.java
index 8a679a4..c485f6b 100644
--- a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconSize.java
+++ b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconSize.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.ui.core.resource.internal;
+package org.eclipse.riena.ui.core.resource;
/**
* Constants for icon sizes.
diff --git a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconState.java b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconState.java
index 25ed899..85b53e0 100644
--- a/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/internal/IconState.java
+++ b/org.eclipse.riena.ui.core/src/org/eclipse/riena/ui/core/resource/IconState.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG - initial API and implementation
*******************************************************************************/
-package org.eclipse.riena.ui.core.resource.internal;
+package org.eclipse.riena.ui.core.resource;
/**
* Constants for icon states.