fixes for static errors
Change-Id: I259110924289d4b37dc97f44776922dfabf671b5
Signed-off-by: Sounak Basu <sounak.basu@sap.com>
diff --git a/org.eclipse.ogee.core/about.ini b/org.eclipse.ogee.core/about.ini
index 0732fbb..2ece563 100644
--- a/org.eclipse.ogee.core/about.ini
+++ b/org.eclipse.ogee.core/about.ini
@@ -1,9 +1,3 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
# Property "aboutText" contains text for "About" dialog (translated)
aboutText=%aboutText
@@ -23,7 +17,7 @@
welcomePerspective=org.eclipse.ogee.utils.perspective
# A short, non-translatable string used to associate a name with the application on platforms where this makes sense.
-appName=OData Model Editor
+appName=%appName
# Tips and tricks section of help documentation.
tipsAndTricksHref=../org.eclipse.ogee.help/html/Creating a Blank OData Model.html
\ No newline at end of file
diff --git a/org.eclipse.ogee.core/about.properties b/org.eclipse.ogee.core/about.properties
index c4785e0..3e17e07 100644
--- a/org.eclipse.ogee.core/about.properties
+++ b/org.eclipse.ogee.core/about.properties
@@ -15,4 +15,6 @@
\n\
The OData Designer (Incubation) feature, provides Eclipse-based developer tools for the provisioning and consumption of OData services regardless of the service provisioning platform and service consuming technology.\n\
\n\
-Copyright (c) 2005, 2011 SAP SE. All rights reserved.
\ No newline at end of file
+Copyright (c) 2005, 2011 SAP SE. All rights reserved.
+
+appName=OData Model Editor
\ No newline at end of file
diff --git a/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/FrameworkMessages.java b/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/FrameworkMessages.java
index b6771dd..e7b596d 100644
--- a/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/FrameworkMessages.java
+++ b/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/FrameworkMessages.java
@@ -196,8 +196,6 @@
public static String UninstallAction_0;
- public static String UninstallAction_1;
-
public static String UninstallAction_2;
public static String UninstallAction_3;
diff --git a/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/framework.properties b/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/framework.properties
index 6ea718c..ac9c72e 100644
--- a/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/framework.properties
+++ b/org.eclipse.ogee.core/src/org/eclipse/ogee/core/nls/messages/framework.properties
@@ -282,10 +282,8 @@
# YMSG
ServiceFromODataWizardPage_3=Copy an existing OData Model
# YMSG
-UninstallAction_0=Framework SAP plug-in uninstall process error
+UninstallAction_0=Ogee plug-in uninstall process error
# YMSG
-UninstallAction_1=Framework SAP plug-in uninstall process error
+UninstallAction_2=Ogee plug-in uninstall process has started
# YMSG
-UninstallAction_2=Framework SAP plug-in uninstall process has started
-# YMSG
-UninstallAction_3=Framework SAP plug-in uninstall process has finished successfully
\ No newline at end of file
+UninstallAction_3=Ogee plug-in uninstall process has finished successfully
\ No newline at end of file
diff --git a/org.eclipse.ogee.feature/about.ini b/org.eclipse.ogee.feature/about.ini
deleted file mode 100644
index 0732fbb..0000000
--- a/org.eclipse.ogee.feature/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains text for "About" dialog (translated)
-aboutText=%aboutText
-
-# A 16x16 pixel color image used to brand windows created by a product.
-windowImage=/res/images/ODataLogo-16.png
-
-# A 32x32 pixel color image used as an icon for this feature.
-featureImage=/res/images/ODataLogo-32.png
-
-# A large color image that appears in the main "about" dialog for a product.
-aboutImage=/res/images/ODataLogo-250.png
-
-# A welcome page.
-welcomePage=$nl$/welcome.xml
-
-# The preferred perspective in which to show the welcome page.
-welcomePerspective=org.eclipse.ogee.utils.perspective
-
-# A short, non-translatable string used to associate a name with the application on platforms where this makes sense.
-appName=OData Model Editor
-
-# Tips and tricks section of help documentation.
-tipsAndTricksHref=../org.eclipse.ogee.help/html/Creating a Blank OData Model.html
\ No newline at end of file
diff --git a/org.eclipse.ogee.feature/welcome.xml b/org.eclipse.ogee.feature/welcome.xml
deleted file mode 100644
index 326df2f..0000000
--- a/org.eclipse.ogee.feature/welcome.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<welcomePage title="Eclipse Platform">
-
- <intro>This page will help familiarize you with the Eclipse Workbench.
- To get started, read the sections below and click on the related
- links.
- </intro>
-
- <item>
- <b>Installed Features </b>
- To find out more about the features installed in your workbench,
- choose
- <action pluginId="org.eclipse.ui" class="org.eclipse.ui.internal.QuickStartAction">Help > Welcome...
- </action>
- and select the feature you are interested in.
- </item>
-
- <item>
- <b>Perspectives, views and editors </b>
- A window contains one or more perspectives. A perspective consists of
- views (e.g. Navigator)
- and editors for working with your resources.
- The
- shortcut bar at the far left of the window allows you to open new
- perspectives and move
- between perspectives that are already open. The
- perspective you are currently
- working with
- is shown in the title of the
- window and in the shortcut bar as a
- pushed-in icon.
- </item>
-
- <item>
- <b>Configuring your perspectives</b>
- You can move views and editors around the workbench by dragging their
- titlebars. You can
- also add more views to your current perspective by
- using Window > Show
- View.
- To reset the perspective to its original
- state, choose
- <action pluginId="org.eclipse.ui"
- class="org.eclipse.ui.internal.ResetPerspectiveAction">Window > Reset Perspective</action>
- .
- Once you have arranged your perspective, you can save it using Window
- >
- Save Perspective As....
- You can customize the views, perspectives and
- New menu operations that
- show up for
- your perspective. To do this choose
- <action pluginId="org.eclipse.ui" class="org.eclipse.ui.internal.EditActionSetsAction">Window > Customize
- Perspective...
- </action>
- .
- A view can additionally be converted into a Fast View by dragging it
- to
- the shortcut bar (at the
- far left of the window).
- </item>
-
- <item>
- <b>Learn more </b>
- To learn more you can browse the
- <topic id="/org.eclipse.platform.doc.user/toc.xml">Workbench User Guide</topic>
- .
- </item>
-
-</welcomePage>
\ No newline at end of file
diff --git a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/perspective/Perspective.java b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/perspective/Perspective.java
index 44078b7..ae944ff 100644
--- a/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/perspective/Perspective.java
+++ b/org.eclipse.ogee.utils/src/org/eclipse/ogee/utils/perspective/Perspective.java
@@ -22,7 +22,6 @@
private static final float BOTTOM_RATIO = 0.70f;
private static final float LEFT_RATIO = 0.20f;
private static final float BOTTOM_LEFT_RATIO = 0.5f;
- private String name = null;
@Override
public void createInitialLayout(IPageLayout layout) {
