catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/data/ProductConfigurationStore.java b/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/data/ProductConfigurationStore.java
index 857d9e9..e27eb70 100644
--- a/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/data/ProductConfigurationStore.java
+++ b/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/data/ProductConfigurationStore.java
@@ -206,7 +206,6 @@
case AUTHENTICATION_VIA_USERNAME: return prefsUsed.getIdentifyByUsername();
case EMAIL_SSL_ON_CONNECT: return prefsUsed.isEmailUseSslOnConnect();
case DEMO_TOOLS_LANGUAGE: return prefsUsed.hasDemoToolsLanguage();
- case DEMO_TOOLS_STRATEGY: return prefsUsed.hasDemoToolsStrategy();
case DEMO_TOOLS_THEME: return prefsUsed.hasDemoToolsTheme();
case DEMO_TOOLS_PRINTSERVICE: return prefsUsed.hasToolsPrintService();
case PROJECT_WIZARD_ABSOLUTE_LOCATION: return prefsUsed.projectWizardUsesAbsoluteLocation();
@@ -230,7 +229,6 @@
case AUTHENTICATION_VIA_USERNAME: prefs.setIdentifyByUsername(value); return;
case EMAIL_SSL_ON_CONNECT: prefs.setEmailUseSslOnConnect(value); return;
case DEMO_TOOLS_LANGUAGE: prefs.setDemoToolsLanguage(value); return;
- case DEMO_TOOLS_STRATEGY: prefs.setDemoToolsStrategy(value); return;
case DEMO_TOOLS_THEME: prefs.setDemoToolsTheme(value); return;
case DEMO_TOOLS_PRINTSERVICE: prefs.setToolsPrintService(value); return;
case PROJECT_WIZARD_ABSOLUTE_LOCATION: prefs.setProjectWizardUsingAbsoluteLocation(value); return;
diff --git a/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/page/PreferencePageDemo.java b/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/page/PreferencePageDemo.java
index a583229..2128e95 100644
--- a/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/page/PreferencePageDemo.java
+++ b/org.eclipse.osbp.preferences.ui.page/src/org/eclipse/osbp/preferences/ui/page/PreferencePageDemo.java
@@ -31,9 +31,9 @@
return new Item[] {
new Item(Type.TEXT, Preference.SHOW_PRODUCT_CONFIGURATION, "Product Configuration", false),
new Item(""),
- new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_THEME, "Enable theme selection"),
- new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_STRATEGY, "Enable layout-strategy selection"),
- new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_LANGUAGE, "Enable language/country selection"),
+// new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_THEME, "Enable theme selection"),
+// new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_STRATEGY, "Enable layout-strategy selection"),
+// new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_LANGUAGE, "Enable language/country selection"),
new Item(Type.BOOLEAN, Preference.DEMO_TOOLS_PRINTSERVICE, "Enable print service selection"),
};
}
diff --git a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/IProductConfigurationPrefs.java b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/IProductConfigurationPrefs.java
index ebe64d0..b8c6b64 100644
--- a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/IProductConfigurationPrefs.java
+++ b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/IProductConfigurationPrefs.java
@@ -41,8 +41,6 @@
public abstract String getEuroXRefRatesURLPrevious();
- public abstract String getWelcomeScreen();
-
/**
* @return name of the server running the ActiveMQ Broker Service.<br>Use {@link ProductConfiguration#isServerReasonable(String)} to check if the name is reasonable.
*/
@@ -108,8 +106,6 @@
public abstract boolean hasDemoToolsTheme();
- public abstract boolean hasDemoToolsStrategy();
-
public abstract boolean hasDemoToolsLanguage();
public abstract boolean projectWizardUsesAbsoluteLocation();
diff --git a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/Preference.java b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/Preference.java
index e506461..8ae8bdf 100644
--- a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/Preference.java
+++ b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/Preference.java
@@ -65,7 +65,6 @@
LOCALIZATION_SUPPORTED_LANGUAGES,
PERSISTENCE_UNITS,
DEMO_TOOLS_THEME,
- DEMO_TOOLS_STRATEGY,
DEMO_TOOLS_LANGUAGE,
DEMO_TOOLS_PRINTSERVICE,
PROJECT_WIZARD_ABSOLUTE_LOCATION,
diff --git a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfiguration.java b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfiguration.java
index 634f5e9..41a48b1 100644
--- a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfiguration.java
+++ b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfiguration.java
@@ -78,13 +78,6 @@
return !(serverNameOrIp.contains("<") || serverNameOrIp.contains(">"));
}
- public static String getWelcomeScreen() {
- return prefs().getWelcomeScreen();
- }
-
- public static void setWelcomeScreen(String value) {
- prefs().setWelcomeScreen(value);
- }
/**
* @see http://www.ecb.europa.eu/stats/exchange/eurofxref/html/index.en.html
* @return URL to server with the daily Euro Foreign Exchange Reference
@@ -379,13 +372,6 @@
}
/**
- * @return show strategy tool control if true
- */
- public static boolean hasDemoToolsStrategy() {
- return prefs().hasDemoToolsStrategy();
- }
-
- /**
* @return show langauge tool control if true
*/
public static boolean hasDemoToolsLanguage() {
diff --git a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationDefaultPrefs.java b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationDefaultPrefs.java
index c7b0f28..af2e281 100644
--- a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationDefaultPrefs.java
+++ b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationDefaultPrefs.java
@@ -12,10 +12,6 @@
*/
package org.eclipse.osbp.preferences;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
import java.util.Collection;
import java.util.HashMap;
import java.util.Locale;
@@ -100,20 +96,6 @@
PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML_DEFAULT);
}
- private String readHTML() throws IOException {
- StringBuilder builder = new StringBuilder();
- URL url = getClass().getResource("welcome.html");
- if (url != null) {
- BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
- while (reader.ready()) {
- builder.append(reader.readLine());
- builder.append("\n");
- }
- reader.close();
- }
- return builder.toString();
- }
-
private void initializeIfNotExists( // NOSONAR
String dataSource, String dataSourceConsumer, EnumDatabaseVendor vendor, // NOSONAR
String serverName, int serverPort,
@@ -177,14 +159,6 @@
return 10000;
}
- @Override
- public String getWelcomeScreen() {
- try {
- return readHTML();
- } catch (Exception e) {
- return "";
- }
- }
/* (non-Javadoc)
* @see org.eclipse.osbp.preferences.IProductConfigurationPrefs#getEuroXRefRatesURLDaily()
*/
@@ -407,15 +381,7 @@
*/
@Override
public final boolean hasDemoToolsTheme() {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.osbp.preferences.IProductConfigurationPrefs#hasDemoToolsStrategy()
- */
- @Override
- public final boolean hasDemoToolsStrategy() {
- return true;
+ return false;
}
/* (non-Javadoc)
@@ -423,7 +389,7 @@
*/
@Override
public final boolean hasDemoToolsLanguage() {
- return true;
+ return false;
}
@Override
diff --git a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationPrefs.java b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationPrefs.java
index 25a1998..652a465 100644
--- a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationPrefs.java
+++ b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/ProductConfigurationPrefs.java
@@ -112,11 +112,9 @@
private int bpmHibernateMaxFetchDepth;
private String bpmHibernateSchemaName;
private boolean demoToolsTheme;
- private boolean demoToolsStrategy;
private boolean demoToolsLanguage;
private boolean demoToolsPrintService;
private boolean projectWizardAbsoluteLocation;
- private String welcomeScreen;
private boolean mavenActivated;
/* ========================= internal utilities =========================== */
@@ -165,10 +163,6 @@
private static final String UOMOUNIT_METRIC = "uomoUnitMetric";
- /* ========================= welcomescreen initializer =========================== */
- private static final String WELCOMESCREEN_NODE = "welcomeScreen";
- private static final String WELCOMESCREEN_HTML = "html";
-
/* ========================= xref rates initializer =========================== */
private static final String EURO_X_REF_URL_NODE = "euroxrefurl";
@@ -494,11 +488,6 @@
/* ========================= getters =========================== */
- public String getWelcomeScreen() {
- initialize();
- return welcomeScreen;
- }
-
/**
* @see http://www.ecb.europa.eu/stats/exchange/eurofxref/html/index.en.html
* @return URL to server with the daily Euro Foreign Exchange Reference
@@ -957,14 +946,6 @@
}
/**
- * @return show strategy tool control if true
- */
- public final boolean hasDemoToolsStrategy() {
- initialize();
- return demoToolsStrategy;
- }
-
- /**
* @return show langauge tool control if true
*/
public final boolean hasDemoToolsLanguage() {
@@ -990,11 +971,6 @@
/* ========================= setters =========================== */
- public void setWelcomeScreen(String welcomeScreen) {
- this.welcomeScreen = put(WELCOMESCREEN_NODE, WELCOMESCREEN_HTML,
- welcomeScreen);
- }
-
public void setEuroForeignExchangeReferenceRatesURLDaily(
String euroForeignExchangeReferenceRatesURLDaily) {
this.euroForeignExchangeReferenceRatesURLDaily = put(EURO_X_REF_URL_NODE, EURO_X_REF_URL_DAILY,
@@ -1268,10 +1244,6 @@
this.demoToolsTheme = put(DEMO_NODE, DEMO_TOOLS_THEME, demoToolsTheme);
}
- public void setDemoToolsStrategy(boolean demoToolsStrategy) {
- this.demoToolsStrategy = put(DEMO_NODE, DEMO_TOOLS_STRATEGY, demoToolsStrategy);
- }
-
public void setDemoToolsLanguage(boolean demoToolsLanguage) {
this.demoToolsLanguage = put(DEMO_NODE, DEMO_TOOLS_LANGUAGE, demoToolsLanguage);
}
@@ -1608,11 +1580,6 @@
} catch (Exception e) {
exceptions.add(e);
}
- try {
- initializeWelcomeScreen();
- } catch (Exception e) {
- exceptions.add(e);
- }
if (!exceptions.isEmpty()) {
Exception e = new ConfigurationException(exceptions);
LOGGER.error("exceptions caught while reading configuration", e);
@@ -1672,12 +1639,6 @@
uomoMetricUnit = uomounitsNode.getBoolean(UOMOUNIT_METRIC, defaultPrefs.isUomoMetricUnit());
}
- private void initializeWelcomeScreen() throws Exception {
- Preferences welcomeNode = getProductPreferencesNode(WELCOMESCREEN_NODE);
- // --- read all preferences ---
- welcomeScreen = welcomeNode.get(WELCOMESCREEN_HTML, defaultPrefs.getWelcomeScreen());
- }
-
private void initializeEuroXRefRates() throws Exception {
Preferences euroXRefURL = getProductPreferencesNode(EURO_X_REF_URL_NODE);
// --- read all preferences ---
@@ -1970,7 +1931,6 @@
private void initializeDemo() throws Exception {
Preferences demo = getProductPreferencesNode(DEMO_NODE);
demoToolsTheme = demo.getBoolean(DEMO_TOOLS_THEME, defaultPrefs.hasDemoToolsTheme());
- demoToolsStrategy = demo.getBoolean(DEMO_TOOLS_STRATEGY, defaultPrefs.hasDemoToolsStrategy());
demoToolsLanguage = demo.getBoolean(DEMO_TOOLS_LANGUAGE, defaultPrefs.hasDemoToolsLanguage());
demoToolsPrintService = demo.getBoolean(DEMO_TOOLS_PRINTSERVICE, defaultPrefs.hasToolsPrintService());
}
diff --git a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/welcome.html b/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/welcome.html
deleted file mode 100644
index 87a823b..0000000
--- a/org.eclipse.osbp.preferences/src/org/eclipse/osbp/preferences/welcome.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<iframe src="./VAADIN/themes/osbp/html/Welcome.html"
-width="100%" height="100%" name="welcome page">
-
- <p>Alternative Welcome page</p>
-
-</iframe>
