From fd671dc738b9da5a591b1f201d3d930be353c86b Mon Sep 17 00:00:00 2001 From: ju Date: Fri, 1 Jun 2018 12:36:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=94=B9?= =?UTF-8?q?=E4=B8=8Benv=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/DesignerFrame.java | 4 ++-- .../mainframe/loghandler/socketio/DesignerSocketIO.java | 6 +++--- designer-base/src/com/fr/env/SignIn.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java index 98f7de5f90..1d61f5673a 100644 --- a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java @@ -82,8 +82,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import static com.fr.core.env.EnvEvents.AFTER_SIGN_OUT; -import static com.fr.core.env.EnvEvents.BEFORE_SIGN_OUT; +import static com.fr.core.env.EnvEvent.AFTER_SIGN_OUT; +import static com.fr.core.env.EnvEvent.BEFORE_SIGN_OUT; public class DesignerFrame extends JFrame implements JTemplateActionListener, TargetModifiedListener { public static final String DESIGNER_FRAME_NAME = "designer_frame"; diff --git a/designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java b/designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java index 7e37460896..a47caabfd5 100644 --- a/designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java +++ b/designer-base/src/com/fr/design/mainframe/loghandler/socketio/DesignerSocketIO.java @@ -4,7 +4,7 @@ import com.fr.base.env.EnvContext; import com.fr.base.env.resource.LocalEnvConfig; import com.fr.core.env.EnvConfig; import com.fr.core.env.EnvConstants; -import com.fr.core.env.EnvEvents; +import com.fr.core.env.EnvEvent; import com.fr.decision.webservice.utils.DecisionServiceConstants; import com.fr.design.mainframe.loghandler.DesignerLogHandler; import com.fr.event.Event; @@ -43,7 +43,7 @@ public class DesignerSocketIO { }; static { - EventDispatcher.listen(EnvEvents.AFTER_SIGN_OUT, new Listener() { + EventDispatcher.listen(EnvEvent.AFTER_SIGN_OUT, new Listener() { @Override public void on(Event event, Null param) { if (socketIO.isPresent()) { @@ -52,7 +52,7 @@ public class DesignerSocketIO { } } }); - EventDispatcher.listen(EnvEvents.AFTER_SIGN_IN, new Listener() { + EventDispatcher.listen(EnvEvent.AFTER_SIGN_IN, new Listener() { @Override public void on(Event event, Null param) { updateSocket(); diff --git a/designer-base/src/com/fr/env/SignIn.java b/designer-base/src/com/fr/env/SignIn.java index 09ba8c911a..9bf5b90810 100644 --- a/designer-base/src/com/fr/env/SignIn.java +++ b/designer-base/src/com/fr/env/SignIn.java @@ -6,7 +6,7 @@ import com.fr.base.env.EnvContext; import com.fr.base.env.resource.EnvConfigUtils; import com.fr.base.env.resource.RemoteEnvConfig; import com.fr.core.env.EnvConfig; -import com.fr.core.env.EnvEvents; +import com.fr.core.env.EnvEvent; import com.fr.dav.LocalEnv; import com.fr.design.utils.DesignUtils; import com.fr.event.Event; @@ -23,7 +23,7 @@ import javax.swing.UIManager; public class SignIn { static { - EventDispatcher.listen(EnvEvents.CONNECTION_ERROR, new Listener() { + EventDispatcher.listen(EnvEvent.CONNECTION_ERROR, new Listener() { @Override public void on(Event event, Null param) { if (JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Remote_Connect2Server_Again"), UIManager.getString("OptionPane.titleText"), JOptionPane.YES_NO_OPTION) From 1607ac5f95e10f815df7ada215792b746033bd13 Mon Sep 17 00:00:00 2001 From: hzzz Date: Fri, 1 Jun 2018 12:49:11 +0800 Subject: [PATCH 2/2] gradle dependency --- designer-base/build.base.gradle | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer-base/build.base.gradle b/designer-base/build.base.gradle index c8bc1c2c09..094d45d9a6 100644 --- a/designer-base/build.base.gradle +++ b/designer-base/build.base.gradle @@ -59,11 +59,12 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ - compile fileTree(dir:"../${baseDir}/lib-other",include:'**/*.jar') - compile fileTree(dir:"../${baseDir}/lib-core",include:'**/*.jar') - compile fileTree(dir:"../${baseDir}/lib-design",include:'**/*.jar') - compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") - testCompile 'junit:junit:4.12' + compile fileTree(dir:"../${baseDir}/lib-other",include:'**/*.jar') + compile fileTree(dir:"../${baseDir}/lib-core",include:'**/*.jar') + compile fileTree(dir:"../${baseDir}/lib-design",include:'**/*.jar') + compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") + compile group: 'io.socket', name: 'socket.io-client', version: '0.7.0' + testCompile 'junit:junit:4.12' } //输出依赖报