summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorabranson <abranson@PCUWE01.cern.ch>2012-07-25 16:30:04 +0200
committerabranson <abranson@PCUWE01.cern.ch>2012-07-25 16:30:04 +0200
commit5209536cdc57f462cc2f031a17d881fe103218b4 (patch)
treea2fc06e6e349dee2ee8fdf05d674cbfd9f1728d6 /src
parent310608795febd7e3baf90faddafec9dc7c6ea404 (diff)
Resource filtering for version number
Import cleanup
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java1
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java1
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java1
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java4
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java2
-rw-r--r--src/main/resources/module.xml2
6 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java b/src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java
index 59ff8f7..3be1b60 100644
--- a/src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java
+++ b/src/main/java/com/c2kernel/gui/DynamicTreeBuilder.java
@@ -12,7 +12,6 @@ import com.c2kernel.gui.tree.NodeSubscriber;
import com.c2kernel.lookup.Path;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
-import com.c2kernel.utils.Resource;
/**
* Installed as the user object on a single child node of a new node known to be composite.
diff --git a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
index 340ec63..ce195c8 100644
--- a/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
+++ b/src/main/java/com/c2kernel/gui/tabs/DomainPathAdmin.java
@@ -17,7 +17,6 @@ import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.lookup.DomainPath;
import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.Logger;
/**************************************************************************
*
diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java
index e5d1dcc..9e5a9b2 100644
--- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java
@@ -33,7 +33,6 @@ import com.c2kernel.persistency.ClusterStorage;
import com.c2kernel.process.Gateway;
import com.c2kernel.property.Property;
import com.c2kernel.utils.Language;
-import com.c2kernel.utils.Logger;
/**
* Pane to display all work orders that this agent can execute, and activate
diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
index 14a15f6..2b2ae17 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
@@ -10,10 +10,8 @@ import java.io.File;
import java.util.ArrayList;
import javax.swing.Box;
-import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComboBox;
-import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -24,7 +22,6 @@ import javax.swing.JTextArea;
import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.entity.agent.Job;
import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.gui.ImageLoader;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.tabs.EntityTabPane;
import com.c2kernel.gui.tabs.ExecutionPane;
@@ -32,7 +29,6 @@ import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;
import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;
import com.c2kernel.gui.tabs.outcome.OutcomeException;
import com.c2kernel.gui.tabs.outcome.OutcomeHandler;
-import com.c2kernel.process.Gateway;
import com.c2kernel.utils.FileStringUtility;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.LocalObjectLoader;
diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java
index 566d7c5..023e3c3 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java
+++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java
@@ -137,7 +137,7 @@ class OutcomeEditor extends JFrame implements ActionListener {
targetFile = chooser.getSelectedFile();
}
try {
- System.out.println(fileType+"="+targetFile.toURL());
+ System.out.println(fileType+"="+targetFile.toURI().toURL());
} catch (Exception ex) { }
return targetFile;
}
diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index e17cd7e..c6b8928 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -1,7 +1,7 @@
<CristalModule ns="gui" name="CristalGui">
<Info>
<Description>The default CRISTAL GUI</Description>
- <Version>2.3.1</Version>
+ <Version>${version}</Version>
</Info>
<ResourceURL>com/c2kernel/gui/resources/</ResourceURL>
<Imports/>