summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-28 08:29:19 (EST)
committerStephan Born2012-04-23 07:39:39 (EDT)
commit2cff147ffa24c7d55bd3cc93f2b5850bf788874c (patch)
tree0c619fa3c3be266057937ded66f18b15eb09670f
parent37cbf42aa5d467d322c215e6b326e6090f78d875 (diff)
downloadorg.eclipse.stardust.engine-2cff147ffa24c7d55bd3cc93f2b5850bf788874c.zip
org.eclipse.stardust.engine-2cff147ffa24c7d55bd3cc93f2b5850bf788874c.tar.gz
org.eclipse.stardust.engine-2cff147ffa24c7d55bd3cc93f2b5850bf788874c.tar.bz2
CRNT-23823 Adapt build process in order to compile product with Java6 (fixed encoding issue)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/engine@54110 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/common/Currency.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/LocalAdministrationService.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/RemoteAdministrationService.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/beans/RemoteAdministrationServiceImpl.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingLocalAdministrationService.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingRemoteAdministrationService.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/AdministrationService.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/PasswordRules.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/AttributePanel.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/GenericSearchPanel.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/ImageEntry.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MandatoryManager.java14
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MoneyEntry.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/SelectLocaleDialog.java4
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/utils/calendar/ArrowButton.java4
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/model/convert/topease/TopEaseConverter.java4
16 files changed, 25 insertions, 25 deletions
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/common/Currency.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/common/Currency.java
index 53758eb..b5fd164 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/common/Currency.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/common/Currency.java
@@ -22,7 +22,7 @@ class Currency
{
public static final Currency EUR = new Currency("EUR", "Euro",
new BigDecimal(1.0), 2);
- public static final Currency ATS = new Currency("ATS", "Öster. Schilling",
+ public static final Currency ATS = new Currency("ATS", "Öster. Schilling",
new BigDecimal(13.7603), 2);
public static final Currency BEF = new Currency("BEF", "Belg. Franc",
new BigDecimal(40.3399), 2);
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/LocalAdministrationService.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/LocalAdministrationService.java
index d29db23..4f62f4e 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/LocalAdministrationService.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/LocalAdministrationService.java
@@ -625,7 +625,7 @@ public interface LocalAdministrationService extends javax.ejb.EJBLocalObject
* parameter is true,
* the execution of activities is performed in the calling thread only up to the first
* transition marked
- * with “Fork on Traversal”, from that point on execution is asynchronous.
+ * with "Fork on Traversal", from that point on execution is asynchronous.
*
* @param modelOID the model where the process is defined.
* @param id the ID of the process to start.
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/RemoteAdministrationService.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/RemoteAdministrationService.java
index e45f3b2..03a71ab 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/RemoteAdministrationService.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/RemoteAdministrationService.java
@@ -625,7 +625,7 @@ public interface RemoteAdministrationService extends javax.ejb.EJBObject
* parameter is true,
* the execution of activities is performed in the calling thread only up to the first
* transition marked
- * with “Fork on Traversal”, from that point on execution is asynchronous.
+ * with "Fork on Traversal", from that point on execution is asynchronous.
*
* @param modelOID the model where the process is defined.
* @param id the ID of the process to start.
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/beans/RemoteAdministrationServiceImpl.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/beans/RemoteAdministrationServiceImpl.java
index 26df35b..3e9f968 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/beans/RemoteAdministrationServiceImpl.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/beans/RemoteAdministrationServiceImpl.java
@@ -990,7 +990,7 @@ public class RemoteAdministrationServiceImpl extends org.eclipse.stardust.engine
* parameter is true,
* the execution of activities is performed in the calling thread only up to the first
* transition marked
- * with “Fork on Traversal”, from that point on execution is asynchronous.
+ * with "Fork on Traversal", from that point on execution is asynchronous.
*
* @param modelOID the model where the process is defined.
* @param id the ID of the process to start.
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingLocalAdministrationService.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingLocalAdministrationService.java
index 41fd45a..ffca7ce 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingLocalAdministrationService.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingLocalAdministrationService.java
@@ -657,7 +657,7 @@ public interface TunnelingLocalAdministrationService extends javax.ejb.EJBLocalO
* parameter is true,
* the execution of activities is performed in the calling thread only up to the first
* transition marked
- * with “Fork on Traversal”, from that point on execution is asynchronous.
+ * with "Fork on Traversal", from that point on execution is asynchronous.
*
* @param modelOID the model where the process is defined.
* @param id the ID of the process to start.
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingRemoteAdministrationService.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingRemoteAdministrationService.java
index 796f329..c600424 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingRemoteAdministrationService.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/ejb2/tunneling/TunnelingRemoteAdministrationService.java
@@ -657,7 +657,7 @@ public interface TunnelingRemoteAdministrationService extends javax.ejb.EJBObjec
* parameter is true,
* the execution of activities is performed in the calling thread only up to the first
* transition marked
- * with “Fork on Traversal”, from that point on execution is asynchronous.
+ * with "Fork on Traversal", from that point on execution is asynchronous.
*
* @param modelOID the model where the process is defined.
* @param id the ID of the process to start.
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/AdministrationService.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/AdministrationService.java
index ad766fa..4b87df6 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/AdministrationService.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/AdministrationService.java
@@ -439,7 +439,7 @@ public interface AdministrationService extends Service
* Starts a process from a specified model.The startProcess method is executed asynchronously
* if the synchronously parameter is set to false.However, even if the synchronously parameter is true,
* the execution of activities is performed in the calling thread only up to the first transition marked
- * with “Fork on Traversal”, from that point on execution is asynchronous.
+ * with "Fork on Traversal", from that point on execution is asynchronous.
*
* @param modelOID the model where the process is defined.
* @param id the ID of the process to start.
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/PasswordRules.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/PasswordRules.java
index d173c78..2095bb7 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/PasswordRules.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/api/runtime/PasswordRules.java
@@ -134,7 +134,7 @@ public interface PasswordRules extends Serializable
void setDifferentCharacters(int length);
/**
- * ´Gets the number of minimum different characters in the new password compared to previous passwords.
+ * Gets the number of minimum different characters in the new password compared to previous passwords.
*
* @return Number.
*/
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/AttributePanel.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/AttributePanel.java
index b5a5dec..e0bac18 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/AttributePanel.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/AttributePanel.java
@@ -68,7 +68,7 @@ public class AttributePanel extends JPanel
}
else if (e.getSource() == removePropertyItem)
{
- // @todo ... implementieren der delete-Funktionalität
+ // @todo ... implement delete functionality
}
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/GenericSearchPanel.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/GenericSearchPanel.java
index 6b75c45..de1208f 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/GenericSearchPanel.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/GenericSearchPanel.java
@@ -136,7 +136,7 @@ public class GenericSearchPanel extends JPanel implements ActionListener
searchButton.addActionListener(this);
exactBox = new JCheckBox("Exakte Suche", false);
- sensitiveBox = new JCheckBox("Groß/Kleinschreibung beachten", true);
+ sensitiveBox = new JCheckBox("Gross-/Kleinschreibung beachten", true);
searchButtonPanel = new JPanel();
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/ImageEntry.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/ImageEntry.java
index c52519b..dec7434 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/ImageEntry.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/ImageEntry.java
@@ -165,7 +165,7 @@ public class ImageEntry extends JLabel
if (fileDialog == null)
{
- fileDialog = new FileDialog(frame, "Bilddatei öffnen", FileDialog.LOAD);
+ fileDialog = new FileDialog(frame, "Bilddatei öffnen", FileDialog.LOAD);
}
// @todo: Filename Filter setzen!!
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MandatoryManager.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MandatoryManager.java
index e95f83a..8301bed 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MandatoryManager.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MandatoryManager.java
@@ -425,7 +425,7 @@ public class MandatoryManager
}
else if (typeName.endsWith(".PasswordEntry"))
{
- name = "das Paßwortfeld";
+ name = "das Passwortfeld";
}
}
else if (component instanceof JComboBox)
@@ -438,7 +438,7 @@ public class MandatoryManager
}
else if (component instanceof JPasswordField)
{
- name = "das Paßwortfeld";
+ name = "das Passwortfeld";
}
else if (component instanceof JTextField)
{
@@ -466,17 +466,17 @@ class MessageBoxAdapter implements MandatoryListener
*/
public void processEvent(MandatoryEvent e)
{
- String message = "Zur korrekten Datenübernahme ist noch\n";
+ String message = "Zur korrekten Datenübernahme ist noch\n";
String text = e.getText();
if (text == null || text.length() < 1)
{
- message += e.getType() + " auszufüllen.";
+ message += e.getType() + " auszufüllen.";
}
else
{
- message += e.getType() + " \"" + text + "\" auszufüllen.";
+ message += e.getType() + " \"" + text + "\" auszufüllen.";
}
JOptionPane pane = new JOptionPane(message, JOptionPane.INFORMATION_MESSAGE);
@@ -514,12 +514,12 @@ class TextFieldAdapter implements MandatoryListener
if (text == null || text.length() < 1)
{
- textComponent.setText("Bitte noch das aktuelle Feld ausfüllen.");
+ textComponent.setText("Bitte noch das aktuelle Feld ausfüllen.");
}
else
{
textComponent.setText("Bitte noch " + e.getType()
- + " \"" + text + "\" ausfüllen.");
+ + " \"" + text + "\" ausfüllen.");
}
}
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MoneyEntry.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MoneyEntry.java
index badb8f0..b04bd9e 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MoneyEntry.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/MoneyEntry.java
@@ -863,7 +863,7 @@ public class MoneyEntry extends JPanel
JRadioButtonMenuItem menuItem;
String defaultCurrency = Money.getCurrencyFor(Money.getDefaultCurrency());
- JMenu menu = new JMenu("Währung");
+ JMenu menu = new JMenu("Währung");
ButtonGroup group = new ButtonGroup();
JMenu europeanMenu = new JMenu("Europa");
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/SelectLocaleDialog.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/SelectLocaleDialog.java
index b44368d..1af8971 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/SelectLocaleDialog.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/SelectLocaleDialog.java
@@ -71,7 +71,7 @@ public class SelectLocaleDialog extends AbstractDialog
countryEntry.getText() == null ||
countryEntry.getText().length() == 0)
{
- throw new ValidationException("Sprache und Land dürfen nicht leer sein.", false);
+ throw new ValidationException("Sprache und Land dürfen nicht leer sein.", false);
}
}
@@ -88,6 +88,6 @@ public class SelectLocaleDialog extends AbstractDialog
singleton.mainWindow = mainWindow;
- return showDialog("Locale ändern", singleton, mainWindow);
+ return showDialog("Locale ändern", singleton, mainWindow);
}
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/utils/calendar/ArrowButton.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/utils/calendar/ArrowButton.java
index 5044fb7..4d5fcce 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/utils/calendar/ArrowButton.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/compatibility/gui/utils/calendar/ArrowButton.java
@@ -60,7 +60,7 @@ public class ArrowButton extends BasicArrowButton
g.drawLine(w - 1, h - 1, w - 1, 0);
}
- // If there’s no room to draw arrow, bail
+ // If there's no room to draw arrow, bail
if (h < 5 || w < 5)
{
g.setColor(origColor);
@@ -78,7 +78,7 @@ public class ArrowButton extends BasicArrowButton
paintTriangle(g, (w - size) / 2, (h - size) / 2,
size, direction, isEnabled);
- // Reset the Graphics back to it’s original settings
+ // Reset the Graphics back to it's original settings
if (isPressed)
{
g.translate(-1, -1);
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/model/convert/topease/TopEaseConverter.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/model/convert/topease/TopEaseConverter.java
index 928507c..0d4e1d6 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/model/convert/topease/TopEaseConverter.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/model/convert/topease/TopEaseConverter.java
@@ -71,7 +71,7 @@ public class TopEaseConverter extends org.eclipse.stardust.engine.core.model.con
if (!codeGenerationSourceDir.exists())
{
- new PublicException("TopEase® code generation source directory \""
+ new PublicException("TopEase code generation source directory \""
+ codeGenerationSourceDir.getAbsolutePath() + "\" not found");
}
@@ -79,7 +79,7 @@ public class TopEaseConverter extends org.eclipse.stardust.engine.core.model.con
if (!codeGenerationClassesDir.exists())
{
- new PublicException("TopEase® code generation target classes directory \""
+ new PublicException("TopEase code generation target classes directory \""
+ codeGenerationClassesDir.getAbsolutePath() + "\" not found");
}