From 572ed48efe859731a4047781f2490f4f80f40179 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 8 Aug 2012 01:03:09 -0500 Subject: [PATCH] IDEMPIERE-357 Ticket #1001002 Move the Menu to be a Portlet / fix swing client not working --- org.adempiere.ui.swing/META-INF/MANIFEST.MF | 1 + .../src/org/adempiere/apps/graph/HtmlDashboard.java | 2 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 1 + .../src/org/adempiere/webui/desktop/DashboardController.java | 2 +- org.adempiere.ui/META-INF/MANIFEST.MF | 2 +- org.adempiere.ui/src/org/compiere/{images => css}/PAPanel.css | 0 6 files changed, 5 insertions(+), 3 deletions(-) rename org.adempiere.ui/src/org/compiere/{images => css}/PAPanel.css (100%) diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index e97de82ac8..bc9b24df60 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -72,6 +72,7 @@ Import-Package: javax.net.ssl, org.apache.ecs, org.apache.ecs.xhtml, org.apache.poi.hssf.usermodel, + org.compiere.css, org.eclipse.core.runtime;version="3.4.0", org.eclipse.equinox.app, org.osgi.framework;version="1.5.0", diff --git a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java index 298f84c7d0..a04137f3d7 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java +++ b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java @@ -111,7 +111,7 @@ public class HtmlDashboard extends JPanel implements MouseListener, // READ CSS URL url = getClass().getClassLoader(). - getResource("org/compiere/images/PAPanel.css"); + getResource("org/compiere/css/PAPanel.css"); InputStreamReader ins; try { ins = new InputStreamReader(url.openStream()); diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index dc87e96739..4da72e9bd6 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Import-Package: javax.servlet, org.apache.commons.codec.binary, org.apache.ecs, org.apache.ecs.xhtml, + org.compiere.css, org.osgi.framework;version="1.5.0", org.slf4j;version="1.6.1", org.slf4j.helpers;version="1.6.1", diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java index 44ea8dbf62..4593dadef7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java @@ -181,7 +181,7 @@ public class DashboardController implements EventListener { { StringBuilder result = new StringBuilder(""); - URL url = getClass().getClassLoader().getResource("org/compiere/images/PAPanel.css"); + URL url = getClass().getClassLoader().getResource("org/compiere/css/PAPanel.css"); InputStreamReader ins; try { ins = new InputStreamReader(url.openStream()); diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index 2c030963ab..14da27cc86 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Export-Package: org.compiere.apps, org.compiere.apps.wf, org.compiere.grid, org.compiere.grid.ed, - org.compiere.images, + org.compiere.css, org.compiere.install, org.compiere.minigrid, org.compiere.print, diff --git a/org.adempiere.ui/src/org/compiere/images/PAPanel.css b/org.adempiere.ui/src/org/compiere/css/PAPanel.css similarity index 100% rename from org.adempiere.ui/src/org/compiere/images/PAPanel.css rename to org.adempiere.ui/src/org/compiere/css/PAPanel.css