catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.dsl.metadata.service/src/org/eclipse/osbp/dsl/metadata/service/DSLBuilderParticipant.java b/org.eclipse.osbp.dsl.metadata.service/src/org/eclipse/osbp/dsl/metadata/service/DSLBuilderParticipant.java
index 1485121..76a3c00 100644
--- a/org.eclipse.osbp.dsl.metadata.service/src/org/eclipse/osbp/dsl/metadata/service/DSLBuilderParticipant.java
+++ b/org.eclipse.osbp.dsl.metadata.service/src/org/eclipse/osbp/dsl/metadata/service/DSLBuilderParticipant.java
@@ -126,6 +126,8 @@
/** The translations. */
private HashMap<String, Properties> translations = new HashMap<>();
+ private boolean osbee = false;
+
/**
* Activate.
*
@@ -164,6 +166,9 @@
return results;
}
log.debug("visiting bundle {}", suspect.getSymbolicName());
+ if(suspect.getSymbolicName().contains("osbee")) {
+ osbee = true;
+ }
scanModelBundles(suspect, results, wiring);
scanRuntimeBundles(suspect);
// bundles containing translations and don't scan translations twice
@@ -716,6 +721,7 @@
return result;
}
+ @SuppressWarnings("unchecked")
@Override
public <T> void execute(T state, Object unitOfWork) {
metadataBuilderService.execute(state, (IUnitOfWork<T>) unitOfWork);
@@ -760,6 +766,14 @@
}
return NamingConventions.getECViewId((Dialog) dialog);
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.osbp.ui.api.metadata.IDSLMetadataService#isOsbee()
+ */
+ @Override
+ public boolean isOsbee() {
+ return osbee;
+ }
}
/**
@@ -974,9 +988,7 @@
return "";
}
DialogPackage pkg = (DialogPackage) dialog.eContainer();
- String name = pkg.getName() + "." + dialog.getName();
-
- return name;
+ return pkg.getName() + "." + dialog.getName();
}
private static String getDatainterchangeFQN(EObject eObject) {
