fda/ch.psi.fda.ui
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: fda:zmq_stream
Branches Tags
fda:master fda:zmq_stream
fda:4.0.0 fda:1.1.40 fda:1.1.30 fda:1.1.28
...
pull from: fda:master
Branches Tags
fda:master fda:zmq_stream
fda:4.0.0 fda:1.1.40 fda:1.1.30 fda:1.1.28

1 Commits
zmq_stream ... master

Author SHA1 Message Date
ebner
f12d75fe8f updated version to 4.0.0 2015-08-20 08:44:09 +02:00
5 changed files with 7 additions and 7 deletions
Expand all files Collapse all files

2
fda.ui.application/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ch.psi</groupId> <groupId>ch.psi</groupId>
<artifactId>fda.ui</artifactId> <artifactId>fda.ui</artifactId>
<version>3.5.0_zmq</version> <version>4.0.0</version>
</parent> </parent>
<artifactId>fda.ui.application</artifactId> <artifactId>fda.ui.application</artifactId>

4
fda.ui.module/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>fda.ui</artifactId> <artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId> <groupId>ch.psi</groupId>
<version>3.5.0_zmq</version> <version>4.0.0</version>
</parent> </parent>
<artifactId>fda.ui.module</artifactId> <artifactId>fda.ui.module</artifactId>
@@ -117,7 +117,7 @@
<dependency> <dependency>
<groupId>ch.psi</groupId> <groupId>ch.psi</groupId>
<artifactId>fda</artifactId> <artifactId>fda</artifactId>
<version>2.5.1_zmq</version> <version>2.6.8</version>
</dependency> </dependency>
<dependency> <dependency>

2
fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleExecutionService.java
View File

@@ -172,7 +172,7 @@ public class SimpleExecutionService implements ExecutionService {
@Override @Override
public boolean supportsFeature(String feature) { public boolean supportsFeature(String feature) {
if(feature.equalsIgnoreCase("ch.psi.aq.feature.otfscan")){ if(feature.equalsIgnoreCase("ch.psi.aq.feature.otfscan")){
String prefix = ch.psi.fda.ui.ee.Configuration.getInstance().getConfiguration().getOtfChannelPrefix(); String prefix = ch.psi.fda.ui.ee.Configuration.getInstance().getConfiguration().getCrlogicPrefix();
if(prefix != null && !prefix.trim().equals("")){ if(prefix != null && !prefix.trim().equals("")){
return true; return true;
} }

4
fda.ui.module/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
View File

@@ -1,2 +1,2 @@
CTL_MainWindow_Title=FDA 3.5.0 ZMQ CTL_MainWindow_Title=FDA 4.0.0
CTL_MainWindow_Title_No_Project=FDA 3.5.0 ZMQ CTL_MainWindow_Title_No_Project=FDA 4.0.0

2
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>ch.psi</groupId> <groupId>ch.psi</groupId>
<artifactId>fda.ui</artifactId> <artifactId>fda.ui</artifactId>
<version>3.5.0_zmq</version> <version>4.0.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ch.psi.fda.ui.parent</name> <name>ch.psi.fda.ui.parent</name>