Author: remi
Date: 2008-08-13 14:49:18 +0200 (Wed, 13 Aug 2008)
New Revision: 1471
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
Removed:
software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
Log:
* updated i18n
Modified:
software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
===================================================================
--- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-13 12:32:30 UTC (rev 1470)
+++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java
2008-08-13 12:49:18 UTC (rev 1471)
@@ -69,7 +69,7 @@
{
super();
initGUI();
- this.setTitle(Messages.getString("MainFrame.1")); //$NON-NLS-1$
+ this.setTitle(ATTMessages.getString("MainFrame.1"));
//$NON-NLS-1$
}
/*
@@ -132,7 +132,7 @@
frameLayout.setConstraints(statusBar, c);
this.add(statusBar);
-
attBlockViewer.loadImages(Messages.getString("MainFrame.30")); //$NON-NLS-1$
+
attBlockViewer.loadImages(ATTMessages.getString("MainFrame.30")); //$NON-NLS-1$
attBlockViewer.events.register(ATTConfig.EVENT_POSITION_CHANGED, this,
"onPositionChanged"); //$NON-NLS-1$
attBlockViewer.events.register(ATTConfig.EVENT_LENGTH_CHANGED, this,
"onLengthChanged"); //$NON-NLS-1$
attBlockViewer.events.register(ATTConfig.EVENT_ZOOM_CHANGED, this,
"onZoomChanged"); //$NON-NLS-1$
@@ -181,7 +181,7 @@
attBlockViewer.add(zoomFullButton, new
AnchorConstraint(580, 270));
/* Create button */
- createButton = new
ATTSButton(Messages.getString("MainFrame.50"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ createButton = new
ATTSButton(ATTMessages.getString("MainFrame.50"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
createButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
createButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
@@ -192,7 +192,7 @@
attBlockViewer.add(createButton, new
AnchorConstraint(110, 271));
/* Delete button */
- deleteButton = new
ATTSButton(Messages.getString("MainFrame.53"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ deleteButton = new
ATTSButton(ATTMessages.getString("MainFrame.53"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
deleteButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
deleteButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
@@ -203,7 +203,7 @@
attBlockViewer.add(deleteButton, new
AnchorConstraint(200, 271));
/* Copy button */
- copyButton = new
ATTSButton(Messages.getString("MainFrame.56"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ copyButton = new
ATTSButton(ATTMessages.getString("MainFrame.56"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
copyButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
copyButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
@@ -214,7 +214,7 @@
attBlockViewer.add(copyButton, new
AnchorConstraint(290, 271));
/* Past button */
- pastButton = new
ATTSButton(Messages.getString("MainFrame.59"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ pastButton = new
ATTSButton(ATTMessages.getString("MainFrame.59"), Color.WHITE,
"/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
pastButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$
pastButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
@@ -225,7 +225,7 @@
attBlockViewer.add(pastButton, new
AnchorConstraint(380, 271));
/* Play button */
- playButton = new
ATTSButton(Messages.getString("MainFrame.62"), Color.BLACK,
"/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ playButton = new
ATTSButton(ATTMessages.getString("MainFrame.62"), Color.BLACK,
"/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
playButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$
playButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
@@ -236,7 +236,7 @@
attBlockViewer.add(playButton, new AnchorConstraint(10,
248));
/* Stop button */
- stopButton = new
ATTSButton(Messages.getString("MainFrame.65"), Color.BLACK,
"/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ stopButton = new
ATTSButton(ATTMessages.getString("MainFrame.65"), Color.BLACK,
"/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$
stopButton.setPressedIcon(new
ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$
stopButton.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent evt)
@@ -284,7 +284,7 @@
public void propertiesWindowClosed(WindowEvent evt)
{
System.out.println("The properties windows is closed !!");
//$NON-NLS-1$
- this.setTitle(Messages.getString("MainFrame.0") +
attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$
+ this.setTitle(ATTMessages.getString("MainFrame.0") +
attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$
}
/*
------------------------------------------------------------------------
@@ -302,8 +302,8 @@
/* Save the changes first */
int result = JOptionPane.showConfirmDialog(
this,
- Messages.getString("MainFrame.97"),
//$NON-NLS-1$
- Messages.getString("MainFrame.72"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.97"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.72"),
//$NON-NLS-1$
JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION)
{
@@ -328,8 +328,8 @@
/* Save the changes first */
int result = JOptionPane.showConfirmDialog(
this,
- Messages.getString("MainFrame.74"),
//$NON-NLS-1$
- Messages.getString("MainFrame.75"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.74"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.75"),
//$NON-NLS-1$
JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION)
{
@@ -351,7 +351,7 @@
if (attBlockViewer.loadAttitune(selFile.getPath()))
{
attBlockViewer.setAttituneIsTemplate(false);
- JOptionPane.showMessageDialog(this,
Messages.getString("MainFrame.77")); //$NON-NLS-1$
+ JOptionPane.showMessageDialog(this,
ATTMessages.getString("MainFrame.77")); //$NON-NLS-1$
}
}
}
@@ -366,7 +366,7 @@
if (badParams.size() > 0)
{
JOptionPane.showMessageDialog(this,
- Messages.getString("MainFrame.78"));
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.78"));
//$NON-NLS-1$
confirmExit = false;
return;
}
@@ -392,7 +392,7 @@
if (badParams.size() > 0)
{
JOptionPane.showMessageDialog(this,
- Messages.getString("MainFrame.79"));
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.79"));
//$NON-NLS-1$
return;
}
/* Open a file viewer to select an attitune */
@@ -444,8 +444,8 @@
/* Save the changes first */
int result = JOptionPane.showConfirmDialog(
this,
- Messages.getString("MainFrame.81"),
//$NON-NLS-1$
- Messages.getString("MainFrame.82"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.81"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.82"),
//$NON-NLS-1$
JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION)
{
@@ -519,7 +519,7 @@
*/
public void onPositionChanged(Double newPosition)
{
- statusBar.setLabel1(Messages.getString("MainFrame.85") +
ATTMisc.timeToString(newPosition)); //$NON-NLS-1$
+ statusBar.setLabel1(ATTMessages.getString("MainFrame.85") +
ATTMisc.timeToString(newPosition)); //$NON-NLS-1$
}
/*
@@ -527,7 +527,7 @@
*/
public void onLengthChanged(Double newLength)
{
- statusBar.setLabel2(Messages.getString("MainFrame.86") +
ATTMisc.timeToString(newLength)); //$NON-NLS-1$
+ statusBar.setLabel2(ATTMessages.getString("MainFrame.86") +
ATTMisc.timeToString(newLength)); //$NON-NLS-1$
}
/*
@@ -570,7 +570,7 @@
*/
public void onBlockSelected(ATTBlock block)
{
- statusBar.setLabel3(Messages.getString("MainFrame.87") +
ATTMisc.timeToString(block.getPosition())); //$NON-NLS-1$
+ statusBar.setLabel3(ATTMessages.getString("MainFrame.87") +
ATTMisc.timeToString(block.getPosition())); //$NON-NLS-1$
}
/*
@@ -585,7 +585,7 @@
*/
public void onBlockDragging(ATTBlock block, Double timeIdx)
{
- statusBar.setLabel3(Messages.getString("MainFrame.88") +
ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$
+ statusBar.setLabel3(ATTMessages.getString("MainFrame.88") +
ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$
}
/*
@@ -600,9 +600,9 @@
*/
public void onAttituneLoaded(ATTBlockViewer bv)
{
- statusBar.setLabel1(Messages.getString("MainFrame.89") +
ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$
- statusBar.setLabel2(Messages.getString("MainFrame.90") +
ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$
- statusBar.setLabel3(Messages.getString("MainFrame.91"));
//$NON-NLS-1$
+ statusBar.setLabel1(ATTMessages.getString("MainFrame.89") +
ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$
+ statusBar.setLabel2(ATTMessages.getString("MainFrame.90") +
ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$
+ statusBar.setLabel3(ATTMessages.getString("MainFrame.91"));
//$NON-NLS-1$
this.setTitle("Attitunes studio - " +
attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$
}
@@ -611,7 +611,7 @@
*/
public void onAttituneSaved(ATTBlockViewer bv)
{
- JOptionPane.showMessageDialog(this,
Messages.getString("MainFrame.93")); //$NON-NLS-1$
+ JOptionPane.showMessageDialog(this,
ATTMessages.getString("MainFrame.93")); //$NON-NLS-1$
}
/*
------------------------------------------------------------------------
@@ -663,8 +663,8 @@
{
int result = JOptionPane.showConfirmDialog(
this,
- Messages.getString("MainFrame.95"),
//$NON-NLS-1$
- Messages.getString("MainFrame.96"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.95"),
//$NON-NLS-1$
+ ATTMessages.getString("MainFrame.96"),
//$NON-NLS-1$
JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION)
{
Deleted:
software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java
===================================================================
--- software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java
2008-08-13 12:32:30 UTC (rev 1470)
+++ software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java
2008-08-13 12:49:18 UTC (rev 1471)
@@ -1,20 +0,0 @@
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
Added:
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
===================================================================
---
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
(rev 0)
+++
software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java
2008-08-13 12:49:18 UTC (rev 1471)
@@ -0,0 +1,28 @@
+package com.tuxisalive.attitunes;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class ATTMessages
+{
+ private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE;
+
+ static
+ {
+ RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+ }
+
+ public static String getString(String key)
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
