You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cm...@apache.org on 2011/08/15 15:27:08 UTC
svn commit: r1157837 - in /karaf/sandbox/pieber/karaf-webconsole/trunk:
core/src/main/java/org/apache/karaf/webconsole/core/
core/src/main/java/org/apache/karaf/webconsole/core/internal/
core/src/main/resources/org/apache/karaf/webconsole/core/ osgi/sr...
Author: cmoulliard
Date: Mon Aug 15 13:27:07 2011
New Revision: 1157837
URL: http://svn.apache.org/viewvc?rev=1157837&view=rev
Log:
Add translation for NavigationPanel
Added:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.properties
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel_fr.properties
Modified:
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java
karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiConsoleTab.java
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java?rev=1157837&r1=1157836&r2=1157837&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/NavigationPanel.java Mon Aug 15 13:27:07 2011
@@ -1,14 +1,15 @@
package org.apache.karaf.webconsole.core;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.ResourceModel;
+
+import java.util.LinkedList;
+import java.util.List;
public class NavigationPanel extends Panel {
@@ -26,7 +27,7 @@ public class NavigationPanel extends Pan
@Override
protected void populateItem(ListItem<String> item) {
String subItem = item.getModelObject();
- item.add(new BookmarkablePageLink("topLink", tab.getItems().get(subItem)).add(new Label("linkLabel", subItem)));
+ item.add(new BookmarkablePageLink("topLink", tab.getItems().get(subItem)).add(new Label("linkLabel", new ResourceModel(subItem))));
}
});
}
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java?rev=1157837&r1=1157836&r2=1157837&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/internal/SystemConsoleTab.java Mon Aug 15 13:27:07 2011
@@ -1,14 +1,15 @@
package org.apache.karaf.webconsole.core.internal;
+import org.apache.karaf.webconsole.core.ConsoleTab;
+
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.karaf.webconsole.core.ConsoleTab;
-
public class SystemConsoleTab implements ConsoleTab, Serializable {
private static final long serialVersionUID = -7381914604367435106L;
+ private static String dashBoard = "dashboard";
public String getLabel() {
return "Dashboard";
@@ -20,7 +21,7 @@ public class SystemConsoleTab implements
public Map<String, Class> getItems() {
Map<String, Class> map = new HashMap<String, Class>();
- map.put("Dashboard", DashboardPage.class);
+ map.put(dashBoard, DashboardPage.class);
return map;
}
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.properties?rev=1157837&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel.properties Mon Aug 15 13:27:07 2011
@@ -0,0 +1,6 @@
+# Features Console properties
+features.list = Features list
+features.repositories = Features repositories
+
+osgi = OSGi
+dashboard = Dashboard
\ No newline at end of file
Added: karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel_fr.properties
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel_fr.properties?rev=1157837&view=auto
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel_fr.properties (added)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/core/src/main/resources/org/apache/karaf/webconsole/core/NavigationPanel_fr.properties Mon Aug 15 13:27:07 2011
@@ -0,0 +1,6 @@
+# Features Console properties
+features.list = Liste de features
+features.repositories = R\u00E9pertoires de features
+
+osgi = OSGi
+dashboard = Dashboard
\ No newline at end of file
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java?rev=1157837&r1=1157836&r2=1157837&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/FeaturesConsoleTab.java Mon Aug 15 13:27:07 2011
@@ -8,6 +8,8 @@ import java.util.Map;
public class FeaturesConsoleTab implements ConsoleTab {
private static final long serialVersionUID = 1L;
+ private static String featuresList = "features.list";
+ private static String featuresRepositories = "features.repositories";
public String getLabel() {
return "Features";
@@ -17,11 +19,10 @@ public class FeaturesConsoleTab implemen
return FeaturesPage.class;
}
- //new ResourceModel("features.console.list").getObject().toString()
public Map<String, Class> getItems() {
Map<String, Class> features = new HashMap<String, Class>();
- features.put("Features list", FeaturesPage.class);
- features.put("Features repositories", RepositoriesPage.class);
+ features.put(featuresList, FeaturesPage.class);
+ features.put(featuresRepositories, RepositoriesPage.class);
return features;
}
Modified: karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiConsoleTab.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiConsoleTab.java?rev=1157837&r1=1157836&r2=1157837&view=diff
==============================================================================
--- karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiConsoleTab.java (original)
+++ karaf/sandbox/pieber/karaf-webconsole/trunk/osgi/src/main/java/org/apache/karaf/webconsole/osgi/internal/OsgiConsoleTab.java Mon Aug 15 13:27:07 2011
@@ -1,12 +1,14 @@
package org.apache.karaf.webconsole.osgi.internal;
+import org.apache.karaf.webconsole.core.ConsoleTab;
+
import java.util.HashMap;
import java.util.Map;
-import org.apache.karaf.webconsole.core.ConsoleTab;
-
public class OsgiConsoleTab implements ConsoleTab {
+ private static String osgiHome = "osgi";
+
public String getLabel() {
return "Runtime";
}
@@ -17,7 +19,7 @@ public class OsgiConsoleTab implements C
public Map<String, Class> getItems() {
Map<String, Class> map = new HashMap<String, Class>();
- map.put("OSGi", HomePage.class);
+ map.put(osgiHome, HomePage.class);
return map;
}