catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.ui.api/META-INF/MANIFEST.MF b/org.eclipse.osbp.ui.api/META-INF/MANIFEST.MF
index e1c704a..5ea05f7 100644
--- a/org.eclipse.osbp.ui.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ui.api/META-INF/MANIFEST.MF
@@ -37,13 +37,13 @@
org.eclipse.osbp.ui.api.table;version="0.9.0",
org.eclipse.osbp.ui.api.themes;version="0.9.0";uses:="com.vaadin.server",
org.eclipse.osbp.ui.api.user;version="0.9.0";uses:="org.eclipse.osbp.ui.api.customfields,org.eclipse.e4.ui.model.application",
+ org.eclipse.osbp.ui.api.user.filter;version="0.9.0",
org.eclipse.osbp.ui.api.useraccess;version="0.9.0";uses:="org.eclipse.osbp.dsl.common.datatypes,org.eclipse.osbp.ui.api.complexdatacontainer,org.eclipse.osbp.ui.api.userfilter",
- org.eclipse.osbp.ui.api.userfilter;version="0.9.0",
org.eclipse.osbp.ui.initialization;version="0.9.0"
Import-Package: com.vaadin.ui,
javax.validation;version="1.1.0.Final",
javax.validation.constraints;version="1.1.0.Final",
- mondrian.rolap;version="3.5.0",
+ mondrian.rolap,
org.eclipse.e4.core.services.events,
org.eclipse.e4.ui.model.application,
org.eclipse.e4.ui.model.application.commands,
diff --git a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/datamart/DatamartFilter.java b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/datamart/DatamartFilter.java
index 1a59eec..90ad1da 100644
--- a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/datamart/DatamartFilter.java
+++ b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/datamart/DatamartFilter.java
@@ -107,6 +107,19 @@
return name;
}
+ public String getEntityName() {
+ String entity=name.split("\\.")[0];
+ if( entity.contains("_")){
+ entity=entity.split("\\_")[0];
+ }
+ return entity;
+ }
+
+ public String getAliasName() {
+ return name.split("\\.")[0];
+ }
+
+
public String getLiteral() {
return literal;
}
@@ -328,6 +341,28 @@
}
/**
+ * Gets the Entity name.
+ *
+ * @return the Entity name
+ */
+ public String getEntityName() {
+ String entity=name.split("\\.")[0];
+ if( entity.contains("_")){
+ entity=entity.split("\\_")[0];
+ }
+ return entity;
+ }
+
+ /**
+ * Gets the Entity Alias name.
+ *
+ * @return the entity alias name
+ */
+ public String getAliasName() {
+ return name.split("\\.")[0];
+ }
+
+ /**
* Sets the name.
*
* @param name the new name
diff --git a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/metadata/IDSLMetadataService.java b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/metadata/IDSLMetadataService.java
index f39b378..5537b76 100644
--- a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/metadata/IDSLMetadataService.java
+++ b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/metadata/IDSLMetadataService.java
@@ -18,6 +18,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -276,7 +277,16 @@
* @param resourceName the resource name
* @return the class loader
*/
- ClassLoader getClassLoader(String resourceName);
+ ClassLoader getEntityClassLoader(String resourceName);
+
+ /**
+ * Gets the class loader of a given full qualified class.
+ *
+ * @param className
+ * @param extension
+ * @return
+ */
+ ClassLoader getClassLoader(String className, String extension);
/**
* Gets the persistence unit info for a given name.
@@ -337,4 +347,12 @@
* @return true, if successful
*/
boolean hasSupertype(JvmTypeReference typeReference, Class<?> clz);
+
+ /**
+ * Gets the DTOs using a given full qualified stateClass.
+ *
+ * @param stateClassName the state class name
+ * @return the DTOs for stateClass
+ */
+ Set<String> getDTOsForStateClass(String stateClassName);
}
diff --git a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/IUser.java b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/IUser.java
index e123b2b..57317bb 100644
--- a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/IUser.java
+++ b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/IUser.java
@@ -17,6 +17,7 @@
import java.util.Map;
import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.osbp.ui.api.user.filter.FilterMap;
/**
* Every user object needs to implement this interface.
@@ -45,19 +46,6 @@
* @return the profile image id
*/
String getProfileImageId();
- /**
- * Gets the layouting strategy.
- *
- * @return the layouting strategy
- */
- String getLayoutingStrategy();
-
- /**
- * Gets the focusing strategy.
- *
- * @return the focusing strategy
- */
- String getFocusingStrategy();
/**
* Gets the theme.
@@ -238,4 +226,6 @@
Map<Object, Integer> getVisibleColumns(String key);
}
+ FilterMap getUserFilter();
+
}
diff --git a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/userfilter/UserFilterMap.java b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/filter/FilterMap.java
similarity index 94%
rename from org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/userfilter/UserFilterMap.java
rename to org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/filter/FilterMap.java
index 5083d71..a5c616b 100644
--- a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/userfilter/UserFilterMap.java
+++ b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/user/filter/FilterMap.java
@@ -12,12 +12,12 @@
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
*/
-package org.eclipse.osbp.ui.api.userfilter;
+package org.eclipse.osbp.ui.api.user.filter;
import java.util.HashMap;
import java.util.List;
-public class UserFilterMap {
+public class FilterMap {
/** The in filter map. */
private HashMap<String, List<String>> inFilterMap = new HashMap<>();
diff --git a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/useraccess/IUserAccessService.java b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/useraccess/IUserAccessService.java
index bc728d5..4fd4bde 100644
--- a/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/useraccess/IUserAccessService.java
+++ b/org.eclipse.osbp.ui.api/src/org/eclipse/osbp/ui/api/useraccess/IUserAccessService.java
@@ -20,9 +20,9 @@
import org.eclipse.osbp.dsl.common.datatypes.IDto;
import org.eclipse.osbp.ui.api.complexdatacontainer.IComplexDataContainer;
+import org.eclipse.osbp.ui.api.user.filter.FilterMap;
import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Action;
import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Group;
-import org.eclipse.osbp.ui.api.userfilter.UserFilterMap;
/**
* The Interface IUserAccessService.
@@ -435,20 +435,6 @@
String getLocaleTag();
/**
- * Gets the layouting strategy.
- *
- * @return the layouting strategy
- */
- String getLayoutingStrategy();
-
- /**
- * Gets the focusing strategy.
- *
- * @return the focusing strategy
- */
- String getFocusingStrategy();
-
- /**
* Gets the theme.
*
* @return the theme
@@ -467,8 +453,8 @@
*
* @return the user filter map
*/
- UserFilterMap getUserFilterMap();
-
+ FilterMap getFilterMap();
+
/**
* Checks if is superuser.
*
