Author: jbonofre
Date: Fri Jun 8 07:57:15 2012
New Revision: 1347922
URL: http://svn.apache.org/viewvc?rev=1347922&view=rev
Log:
Fix the console style and resources loading
Modified:
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Messages.java
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Styles.java
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/configuration/model/KalumetConsole.java
incubator/kalumet/trunk/console/src/main/resources/org/apache/kalumet/console/app/style/default.stylesheet
Modified:
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Messages.java
URL:
http://svn.apache.org/viewvc/incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Messages.java?rev=1347922&r1=1347921&r2=1347922&view=diff
==============================================================================
---
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Messages.java
(original)
+++
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Messages.java
Fri Jun 8 07:57:15 2012
@@ -34,7 +34,7 @@ import nextapp.echo2.app.ApplicationInst
*/
public class Messages {
- private static final String BUNDLE_NAME =
"org.apache.kalumet.console.app.resources.locales.Messages";
+ private static final String BUNDLE_NAME =
"org.apache.kalumet.console.app.locales.Messages";
// a map which contains DateFormat objects for various locales.
private static final Map DATE_FORMAT_MEDIUM_MAP = new HashMap();
Modified:
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Styles.java
URL:
http://svn.apache.org/viewvc/incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Styles.java?rev=1347922&r1=1347921&r2=1347922&view=diff
==============================================================================
---
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Styles.java
(original)
+++
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/app/Styles.java
Fri Jun 8 07:57:15 2012
@@ -29,8 +29,8 @@ import nextapp.echo2.app.componentxml.St
*/
public class Styles {
- public static final String ICONS_PATH =
"/org/apache/kalumet/console/app/resources/icons/";
- public static final String STYLE_PATH =
"/org/apache/kalumet/console/app/resources/style/";
+ public static final String ICONS_PATH =
"/org/apache/kalumet/console/app/icons/";
+ public static final String STYLE_PATH =
"/org/apache/kalumet/console/app/style/";
// default style sheet.
public static final StyleSheet DEFAULT_STYLE_SHEET;
Modified:
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/configuration/model/KalumetConsole.java
URL:
http://svn.apache.org/viewvc/incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/configuration/model/KalumetConsole.java?rev=1347922&r1=1347921&r2=1347922&view=diff
==============================================================================
---
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/configuration/model/KalumetConsole.java
(original)
+++
incubator/kalumet/trunk/console/src/main/java/org/apache/kalumet/console/configuration/model/KalumetConsole.java
Fri Jun 8 07:57:15 2012
@@ -87,7 +87,7 @@ public class KalumetConsole {
digester.setValidating(false);
digester.addObjectCreate("kalumet-console",
"org.apache.kalumet.console.configuration.model.KalumetConsole");
- digester.addObjectCreate("kalumet-console/property",
"org.apahce.kalumet.console.configuration.model.Property");
+ digester.addObjectCreate("kalumet-console/property",
"org.apache.kalumet.console.configuration.model.Property");
digester.addSetProperties("kalumet-console/property");
digester.addSetNext("kalumet-console/property", "addProperty",
"org.apache.kalumet.console.configuration.model.Property");
Modified:
incubator/kalumet/trunk/console/src/main/resources/org/apache/kalumet/console/app/style/default.stylesheet
URL:
http://svn.apache.org/viewvc/incubator/kalumet/trunk/console/src/main/resources/org/apache/kalumet/console/app/style/default.stylesheet?rev=1347922&r1=1347921&r2=1347922&view=diff
==============================================================================
---
incubator/kalumet/trunk/console/src/main/resources/org/apache/kalumet/console/app/style/default.stylesheet
(original)
+++
incubator/kalumet/trunk/console/src/main/resources/org/apache/kalumet/console/app/style/default.stylesheet
Fri Jun 8 07:57:15 2012
@@ -15,56 +15,56 @@
<border-part position="top-left">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_top_left.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_top_left.png"/>
</image>
</fill-image>
</border-part>
<border-part position="top">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_top.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_top.png"/>
</image>
</fill-image>
</border-part>
<border-part position="top-right">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_top_right.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_top_right.png"/>
</image>
</fill-image>
</border-part>
<border-part position="left">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_left.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_left.png"/>
</image>
</fill-image>
</border-part>
<border-part position="right">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_right.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_right.png"/>
</image>
</fill-image>
</border-part>
<border-part position="bottom-left">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_bottom_left.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_bottom_left.png"/>
</image>
</fill-image>
</border-part>
<border-part position="bottom">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_bottom.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_bottom.png"/>
</image>
</fill-image>
</border-part>
<border-part position="bottom-right">
<fill-image>
<image
type="nextapp.echo2.app.ResourceImageReference">
- <resource-image-reference
resource="/org/apache/kalumet/console/app/resources/style/border_bottom_right.png"/>
+ <resource-image-reference
resource="/org/apache/kalumet/console/app/style/border_bottom_right.png"/>
</image>
</fill-image>
</border-part>
