Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3114 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/ma org/perfsonar/perfsonarui/ma/ui/panels org/perfsonar/perfsonarui/ui

Subject: perfsonar development work

List archive

perfsonar: r3114 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/ma org/perfsonar/perfsonarui/ma/ui/panels org/perfsonar/perfsonarui/ui


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3114 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/ma org/perfsonar/perfsonarui/ma/ui/panels org/perfsonar/perfsonarui/ui
  • Date: Tue, 11 Dec 2007 08:28:42 -0500
Author: nina
Date: 2007-12-11 08:28:42 -0500 (Tue, 11 Dec 2007)
New Revision: 3114

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAResourceKeys.java
Modified:

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
branches/perfsonarui/src/resources.files
Log:
making use of Resource Bundles for strings.

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAResourceKeys.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
2007-12-11 13:25:07 UTC (rev 3113)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
2007-12-11 13:28:42 UTC (rev 3114)
@@ -64,6 +64,7 @@
import org.jfree.ui.RectangleEdge;
import org.perfsonar.perfsonarui.ma.MAMetadataList;
import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
+import org.perfsonar.perfsonarui.ma.MAResourceKeys;
import org.perfsonar.perfsonarui.ma.UserData;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -168,8 +169,8 @@
popup.add(item);
*/
//utilization
- a = new
AbstractAction(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_percent)+"/"+
-
psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_mbs)) {
+ a = new
AbstractAction(psModel.getResourceBundle().getString(MAResourceKeys.msg_utilization_percent)+"/"+
+
psModel.getResourceBundle().getString(MAResourceKeys.msg_utilization_mbs)) {
/**
*
*/
@@ -351,7 +352,7 @@

//cAxis.setTickMarksVisible(false);
na = new NumberAxis();
-
na.setLabel(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_percent));
+
na.setLabel(psModel.getResourceBundle().getString(MAResourceKeys.msg_utilization_percent));
barPlot = new CategoryPlot(dataset,cAxis, na, barRenderer);

barRenderer.setDrawBarOutline(false);
@@ -484,9 +485,9 @@

protected void updateLabels(MetadataChartSet ds) {
if (ds.isUtilization())
-
na.setLabel(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_percent));
+
na.setLabel(psModel.getResourceBundle().getString(MAResourceKeys.msg_utilization_percent));
else
-
na.setLabel(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_mbs));
+
na.setLabel(psModel.getResourceBundle().getString(MAResourceKeys.msg_utilization_mbs));
page.setText((ds.getPage()+1) + " / " + (ds.maxPages()+1));
items.setText((ds.fromIndex()+1) + "-" + (ds.toIndex()+1));
utilizationBox.setSelected(ds.isUtilization());

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
2007-12-11 13:25:07 UTC (rev 3113)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
2007-12-11 13:28:42 UTC (rev 3114)
@@ -38,6 +38,7 @@
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
import org.jfree.chart.renderer.xy.XYStepRenderer;
import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
+import org.perfsonar.perfsonarui.ma.MAResourceKeys;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.ui.PerfsonarModel;
import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
@@ -102,7 +103,7 @@
@Override
protected JFreeChart createChart(IPerfsonarTab psModel,Hashtable
datasets) {
ResourceBundle rb = psModel.getResourceBundle();
- bitAxis = new
NumberAxis(rb.getString(MAPerfsonarModel.msg_utilization_mbs)) {
+ bitAxis = new
NumberAxis(rb.getString(MAResourceKeys.msg_utilization_mbs)) {
/**
*
*/
@@ -118,8 +119,8 @@
bitAxis.setTickMarkPaint(gridColor);
bitAxis.setTickMarksVisible(true);

- NumberAxis countAxis = new
NumberAxis(rb.getString(MAPerfsonarModel.msg_input_errors)
- +'/'+
rb.getString(MAPerfsonarModel.msg_output_drops)) {
+ NumberAxis countAxis = new
NumberAxis(rb.getString(MAResourceKeys.msg_input_errors)
+ +'/'+ rb.getString(MAResourceKeys.msg_output_drops)) {

/**
*

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
2007-12-11 13:25:07 UTC (rev 3113)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
2007-12-11 13:28:42 UTC (rev 3114)
@@ -43,7 +43,7 @@
import javax.swing.table.TableColumnModel;

import org.perfsonar.perfsonarui.AbstractUserData;
-import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
+import org.perfsonar.perfsonarui.ma.MAResourceKeys;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
import org.perfsonar.perfsonarui.ui.panels.PSPanel;
@@ -85,7 +85,7 @@
public void addWidgets(IPerfsonarTab psModel) {
setMinimumSize(minDimension);
setLayout(new BorderLayout());
-
setBorder(BorderFactory.createTitledBorder(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_select_interface)));
+
setBorder(BorderFactory.createTitledBorder(psModel.getResourceBundle().getString(MAResourceKeys.msg_select_interface)));

psModel.getDataList().addObserver(this);
dataTable = new JTable(new
MetaDataTableModel(psModel.getDataList()),

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2007-12-11 13:25:07 UTC (rev 3113)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2007-12-11 13:28:42 UTC (rev 3114)
@@ -47,7 +47,6 @@
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.ResponseData;
import org.perfsonar.perfsonarui.SmartMARequest;
-import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -251,12 +250,12 @@
String resource = getClass().getName();
int p = resource.lastIndexOf('.');
if (p > -1) resource = resource.substring(0,p+1) +
"ResourceBundle";
- logger.info("Loading resources from "+resource);
+ logger.info("Loaded resources from "+resource);
return ResourceBundle.getBundle(resource,Locale.getDefault());
} catch (Exception x) {
- logger.warn(x.getMessage());
- logger.info("Loading resources from
org.perfsonar.perfsonarui.ResourceBundle");
- return
ResourceBundle.getBundle("org.perfsonar.perfsonarui.ResourceBundle",Locale.getDefault());

+ //logger.warn(x.getMessage());
+ logger.info("Fall back: loading resources from
org.perfsonar.perfsonarui.ResourceBundle");
+ return
ResourceBundle.getBundle("org.perfsonar.perfsonarui.ResourceBundle",new
Locale("EN"));
}
}
public IUserData createUserData() {

Modified: branches/perfsonarui/src/resources.files
===================================================================
--- branches/perfsonarui/src/resources.files 2007-12-11 13:25:07 UTC (rev
3113)
+++ branches/perfsonarui/src/resources.files 2007-12-11 13:28:42 UTC (rev
3114)
@@ -20,4 +20,8 @@
org/perfsonar/perfsonarui/flowsa/top.xml
org/perfsonar/perfsonarui/flowsa/MA.conf
org/perfsonar/perfsonarui/config/MA.conf
+org/perfsonar/perfsonarui/ippm/ResourceBundle.properties
+org/perfsonar/perfsonarui/ma/ResourceBundle.properties
+org/perfsonar/perfsonarui/ResourceBundle.properties
+org/perfsonar/perfsonarui/playground/ResourceBundle.properties



  • perfsonar: r3114 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui/ma org/perfsonar/perfsonarui/ma/ui/panels org/perfsonar/perfsonarui/ui, svnlog, 12/11/2007

Archive powered by MHonArc 2.6.16.

Top of Page