'调整资源文件'

build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="jar" name="plugin">
     <!-- JDK路径，根据自己机器上实际位置修改-->
-    <property name="jdk.home" value="D:/Java/jdk1.8.0_25"/>
+    <property name="jdk.home" value="D:/DevelopTools/Java/jdk1.8.0_73"/>
 
     <property name="libs" value="${basedir}/lib"/>
     <property name="publicLibs" value=""/>

plugin-widget-easyslides10.iml

@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.easysilides.v10-1.0/classes" />
+    <output url="file://$MODULE_DIR$/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.easyslides10-1.0/classes" />
-    <output-test url="file://$MODULE_DIR$/../plugin-widget-simpleppt10/target/test-classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
-      <excludeFolder url="file://$MODULE_DIR$/../plugin-widget-simpleppt10/target" />
+      <excludeFolder url="file://$MODULE_DIR$/webroot/WEB-INF/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../plugin-widget-simpleppt10/webroot/WEB-INF/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../simpleppt/target" />
-      <excludeFolder url="file://$MODULE_DIR$/../simpleppt/webroot/WEB-INF/classes" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third:fine-third:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.activator:fine-activator:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.activator:fine-activator:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.core:fine-core:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.core:fine-core:10.0.2019.12.11" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.webui:fine-webui:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.datasource:fine-datasource:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.webui:fine-webui:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.datasource:fine-datasource:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision-report:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision-report:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule-report:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-swift:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule-report:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fineio:fineio:2.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-swift:10.0.2019.12.11" level="project" />
+    <orderEntry type="library" name="Maven: com.fineio:fineio:2.0.2019.12.11" level="project" />
     <orderEntry type="library" name="Maven: com.fr.third.server:servlet-api:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-accumulator:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-accumulator:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.report:fine-report-engine:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.report:fine-report-engine:10.0.2019.12.11" level="project" />
-    <orderEntry type="library" name="Maven: com.fr.report:fine-report-designer:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.report:fine-report-designer:10.0.2019.12.11" level="project" />
     <orderEntry type="library" name="Maven: io.socket:socket.io-client:0.7.0" level="project" />
     <orderEntry type="library" name="Maven: io.socket:engine.io-client:0.7.0" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp-ws:3.0.1" level="project" />
@@ -52,5 +50,12 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util-scan:8.5.32" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jaspic-api:8.5.32" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.44" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third:jxbrowser:6.23.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third:jxbrowser-mac:6.23.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third:jxbrowser-win64:6.23.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
   </component>
 </module>

pom.xml

@@ -10,5 +10,10 @@
     </parent>
 
     <packaging>jar</packaging>
-    <artifactId>plugin-widget-simpleppt10</artifactId>
+    <artifactId>plugin-widget-easyslides10</artifactId>
+
+    <build>
+        <!---如果要更改调试插件，改这里的配置就可以了-->
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.easyslides10-1.0/classes</outputDirectory>
+    </build>
 </project>

src/main/java/com/fr/plugin/easyslides/CssFileLoader.java

@@ -5,6 +5,6 @@ import com.fr.stable.fun.impl.AbstractCssFileHandler;
 public class CssFileLoader extends AbstractCssFileHandler {
     @Override
     public String[] pathsForFiles() {
-        return new String[]{"/com/fr/plugin/easyslides/web/impress-default.css"};
+        return new String[]{"/com/fr/plugin/resources/web/impress-default.css"};
     }
 }

src/main/java/com/fr/plugin/easyslides/JsFileLoader.java

@@ -15,7 +15,7 @@ public class JsFileLoader extends AbstractJavaScriptFileHandler {
     public String[] pathsForFiles() {
         return this.license.isAvailable() ?
                 new String[]{
-                        "/com/fr/plugin/easyslides/web/widget.js"
+                        "/com/fr/plugin/resources/web/widget.js"
                 }
                 : null;
     }

src/main/java/com/fr/plugin/easyslides/LocaleFinder.java

@@ -5,6 +5,6 @@ import com.fr.stable.fun.impl.AbstractLocaleFinder;
 public class LocaleFinder extends AbstractLocaleFinder {
     @Override
     public String find() {
-        return "com/fr/plugin/easyslides/local/easyslides";
+        return "com/fr/plugin/resources/local/easyslides";
     }
 }

src/main/java/com/fr/plugin/easyslides/OptionProvider.java

@@ -10,19 +10,23 @@ import com.fr.plugin.transform.FunctionRecorder;
 @FunctionRecorder
 public class OptionProvider extends AbstractFormWidgetOptionProvider {
 
+    @Override
     @ExecuteFunctionRecord
     public Class<? extends Widget> classForWidget() {
         return EasySlidesWidget.class;
     }
 
+    @Override
     public Class<?> appearanceForWidget() {
         return EasySlidesWidgetUI.class;
     }
 
+    @Override
     public String iconPathForWidget() {//图标
-        return "com/fr/plugin/easyslides/images/icon.png";
+        return "com/fr/plugin/resources/images/icon.png";
     }
 
+    @Override
     public String nameForWidget() {//插件名称
         return Inter.getLocText("Plugin-EasySlides_Widget");
     }

src/main/java/com/fr/plugin/easyslides/ui/EasySlidesWidgetUI.java

@@ -9,7 +9,6 @@ import com.fr.design.mainframe.widget.editors.*;
 import com.fr.form.ui.Widget;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
-import com.fr.plugin.easyslides.ui.SlidesDataSourceEditor;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
@@ -30,7 +29,7 @@ public class EasySlidesWidgetUI extends XWidgetCreator {
         if (this.editor == null) {
             this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
             UILabel label = new UILabel();
-            label.setIcon(IOUtils.readIcon("/com/fr/plugin/easyslides/images/display.png"));
+            label.setIcon(IOUtils.readIcon("/com/fr/plugin/resources/images/display.png"));
             label.setHorizontalAlignment(0);
             label.setVerticalAlignment(0);
             this.editor.add(label, "Center");
@@ -44,7 +43,7 @@ public class EasySlidesWidgetUI extends XWidgetCreator {
 
     @Override
     public String getIconPath() {
-        return "/com/fr/plugin/easyslides/images/icon.png";
+        return "/com/fr/plugin/resources/images/icon.png";
     }
 
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {

src/main/resources/com/fr/plugin/resources/web/widget.js

@@ -10,8 +10,8 @@
 
         _init: function () {
             FR.EasySlides.superclass._init.apply(this, arguments);
-            FR.$defaultImport('/com/fr/plugin/easyslides/web/impress-main.js', 'js');
+            FR.$defaultImport('/com/fr/plugin/resources/web/impress-main.js', 'js');
-            FR.$defaultImport('/com/fr/plugin/easyslides/web/impress-plugins.js', 'js');
+            FR.$defaultImport('/com/fr/plugin/resources/web/impress-plugins.js', 'js');
 
             var o = this.options;
             var myWidgetName = o.widgetName;