From 03464c856fa488e4fc86d82ff8bf6564bc4d006c Mon Sep 17 00:00:00 2001 From: ju Date: Wed, 8 Aug 2018 11:24:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20master?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=85=88=E5=B1=8F=E8=94=BD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/module/DesignerActivator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java index bac7d72476..5316eb8ff1 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java @@ -123,9 +123,9 @@ public class DesignerActivator extends Activator { public void start() { List markers = rightCollectMutable(InterMutableKey.Path); for (LocaleMarker marker : markers) { - if (marker.match(LocaleScope.DESIGN)) { +// if (marker.match(LocaleScope.DESIGN)) { Toolkit.addResource(marker.getPath()); - } +// } } designerModuleStart(); preLoadPane(); From 5ccaffae5b96ddf4a20173c167126da144de4979 Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 20 Aug 2018 20:21:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=B4=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=85=A8=E5=86=99=E6=88=90=2010.0=EF=BC=8C=E5=AF=B9jar?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E5=85=A8=E5=86=99=E6=88=90#{branch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/pom.xml | 4 ++-- designer-chart/pom.xml | 6 +++--- designer-form/pom.xml | 6 +++--- designer-realize/pom.xml | 8 ++++---- pom.xml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/designer-base/pom.xml b/designer-base/pom.xml index d97a420933..942dcd302d 100644 --- a/designer-base/pom.xml +++ b/designer-base/pom.xml @@ -6,7 +6,7 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 @@ -17,5 +17,5 @@ com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file diff --git a/designer-chart/pom.xml b/designer-chart/pom.xml index 472b1e62ba..8d5e30e1c3 100644 --- a/designer-chart/pom.xml +++ b/designer-chart/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file diff --git a/designer-form/pom.xml b/designer-form/pom.xml index 19df80505a..274032bd38 100644 --- a/designer-form/pom.xml +++ b/designer-form/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file diff --git a/designer-realize/pom.xml b/designer-realize/pom.xml index 1e9d72c76e..2e40943ccc 100644 --- a/designer-realize/pom.xml +++ b/designer-realize/pom.xml @@ -6,21 +6,21 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-realize - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3398bbd08a..408bc7be85 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.fr.report fine-report-designer - 10.0-RELEASE-SNAPSHOT + 10.0 ../design-settings/fine-report-designer @@ -19,7 +19,7 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 pom From 986f8455a6c2f9c85f5c0681f18ca6060f6c3cbb Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 20 Aug 2018 20:23:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=B4=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=85=A8=E5=86=99=E6=88=90=2010.0=EF=BC=8C=E5=AF=B9jar?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E5=85=A8=E5=86=99=E6=88=90#{branch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/module/DesignerActivator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java index 5316eb8ff1..bac7d72476 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java @@ -123,9 +123,9 @@ public class DesignerActivator extends Activator { public void start() { List markers = rightCollectMutable(InterMutableKey.Path); for (LocaleMarker marker : markers) { -// if (marker.match(LocaleScope.DESIGN)) { + if (marker.match(LocaleScope.DESIGN)) { Toolkit.addResource(marker.getPath()); -// } + } } designerModuleStart(); preLoadPane();