[MOBY-guts] biomoby commit
Martin Senger
senger at pub.open-bio.org
Sat Nov 12 16:43:48 UTC 2005
senger
Sat Nov 12 11:43:47 EST 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard
In directory pub.open-bio.org:/tmp/cvs-serv12988/src/main/org/biomoby/service/dashboard
Modified Files:
AbstractPanel.java CommonTree.java DataTypesBoard.java
DataTypesTree.java NOTES NamespacesBoard.java
NamespacesTree.java PropertyChannel.java
RegistrationDataTypeSubPanel.java
RegistrationNamespaceSubPanel.java
RegistrationServiceSubPanel.java
RegistrationServiceTypeSubPanel.java RegistryPanel.java
ServiceTypesBoard.java ServiceTypesTree.java
ServicesBoard.java ServicesTree.java
Log Message:
moby-live/Java/src/main/org/biomoby/service/dashboard AbstractPanel.java,1.19,1.20 CommonTree.java,1.16,1.17 DataTypesBoard.java,1.9,1.10 DataTypesTree.java,1.11,1.12 NOTES,1.24,1.25 NamespacesBoard.java,1.4,1.5 NamespacesTree.java,1.6,1.7 PropertyChannel.java,1.6,1.7 RegistrationDataTypeSubPanel.java,1.7,1.8 RegistrationNamespaceSubPanel.java,1.6,1.7 RegistrationServiceSubPanel.java,1.6,1.7 RegistrationServiceTypeSubPanel.java,1.7,1.8 RegistryPanel.java,1.22,1.23 ServiceTypesBoard.java,1.5,1.6 ServiceTypesTree.java,1.8,1.9 ServicesBoard.java,1.5,1.6 ServicesTree.java,1.5,1.6
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/AbstractPanel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/AbstractPanel.java 2005/11/09 16:23:32 1.19
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/AbstractPanel.java 2005/11/12 16:43:47 1.20
@@ -371,6 +371,8 @@
else
area.setText (initValue);
area.setCaretPosition (0);
+ area.setLineWrap (true);
+ area.setWrapStyleWord (true);
if (eventName != null) {
final String eName = eventName;
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/CommonTree.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/CommonTree.java 2005/11/10 14:32:42 1.16
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/CommonTree.java 2005/11/12 16:43:47 1.17
@@ -9,6 +9,7 @@
package org.biomoby.service.dashboard;
import org.tulsoft.tools.gui.SwingUtils;
+import org.tulsoft.shared.PrefsUtils;
import javax.swing.JTree;
import javax.swing.JLabel;
@@ -67,9 +68,13 @@
final static protected int SORTED_BY_INPUT_DATA = 12;
final static protected int SORTED_BY_OUTPUT_DATA = 13;
+ final static protected String PREF_KEY_SEARCH = "searchKey";
+
// tree components
protected JPopupMenu popup;
- protected String lastSearchText = "";
+ protected static String
+ lastSearchText = PrefsUtils.getNode (Dashboard.class).get (PREF_KEY_SEARCH, "");
+
protected int lastSorted = SORTED_BY_NAME;
protected PropertyChannel propertyChannel;
@@ -449,11 +454,13 @@
searchIcon,
null,
lastSearchText);
- if (result != null)
+ if (result != null) {
lastSearchText = result;
+ PrefsUtils.getNode (Dashboard.class).put (PREF_KEY_SEARCH, lastSearchText);
+ }
return result;
}
-
+
/*********************************************************************
*
********************************************************************/
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/DataTypesBoard.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/DataTypesBoard.java 2005/11/10 08:54:31 1.9
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/DataTypesBoard.java 2005/11/12 16:43:47 1.10
@@ -58,6 +58,7 @@
CommonTree customTree) {
super (model, channel);
tree = customTree;
+ tree.setPropertyChannel (channel);
createItself();
this.model.addNotificationListener (this);
}
@@ -79,7 +80,7 @@
calibrateProgressBar ( ((Integer)event.getMessage()).intValue() );
break;
case Notifier.DATA_TYPE_LOADING:
- channel.fire (DashboardProperties.DP_STATUS_MSG, event.getMessage());
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, event.getMessage());
break;
case Notifier.DATA_TYPE_LOADED:
addToProgressBar();
@@ -89,7 +90,7 @@
case Notifier.DATA_TYPES_RESET:
initiator = event.getSource();
if (tree == initiator)
- channel.fire (DashboardProperties.DP_STATUS_MSG, "Done");
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, "Done");
removeProgressBar();
break;
case Notifier.DATA_TYPES_UPDATED:
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/DataTypesTree.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/DataTypesTree.java 2005/11/06 16:47:11 1.11
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/DataTypesTree.java 2005/11/12 16:43:47 1.12
@@ -145,7 +145,6 @@
// runs on the event-dispatching thread.
public void finished() {
- log.debug ("Rendering started");
if (updateException != null)
error (DATA_TYPES_ACCESS_ERROR, updateException);
if (dataTypes != null) {
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NOTES,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NOTES 2005/11/11 08:34:39 1.24
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NOTES 2005/11/12 16:43:47 1.25
@@ -1,3 +1,15 @@
+* Add Throwable.initCause() etc. into exception handling
+
+* Add Alt-x for quick changing panels
+
+* Why are not services sorted by name, the first time they appear in
+ Registry browser?
+
+* BUG: sort services tree by service types: parts of the tree are
+ empty (big gaps)
+
+* move various exceptions from being global to the swing workers
+
* FWK005 parse may not be called while parsing.
- probably when too many network request together
---
@@ -140,6 +152,8 @@
* log4j.configuration property - works only from Ant... add it to the
cmd-line clients, as well
+* use NDC (with log4j) when I understand it... (?)
+
* alltools2:
- JTextFieldWithHistory should remember also an empty value ("")
- combo box history is not updated if exit happened while focus is still in the text field
@@ -183,14 +197,10 @@
problms with registration panel:
- - no auto update after reg/unreg srevice, and data type
- after reload old files stayed (21.sep in data types)
- datetime was in cache but cannot make it into tree, why?
right-click - if nothing selected, it should take what is under te
mouse (selected first), otherwise it is annoying
-serach should be propagated to all (same-kinds) trees in all panels
-
-wrap automatically text in descriptions fields
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NamespacesBoard.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NamespacesBoard.java 2005/11/10 08:54:31 1.4
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NamespacesBoard.java 2005/11/12 16:43:47 1.5
@@ -58,6 +58,7 @@
CommonTree customTree) {
super (model, channel);
tree = customTree;
+ tree.setPropertyChannel (channel);
createItself();
this.model.addNotificationListener (this);
}
@@ -79,7 +80,7 @@
calibrateProgressBar ( ((Integer)event.getMessage()).intValue() );
break;
case Notifier.NAMESPACE_LOADING:
- channel.fire (DashboardProperties.DP_STATUS_MSG, event.getMessage());
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, event.getMessage());
break;
case Notifier.NAMESPACE_LOADED:
addToProgressBar();
@@ -89,7 +90,7 @@
case Notifier.NAMESPACES_RESET:
initiator = event.getSource();
if (tree == initiator)
- channel.fire (DashboardProperties.DP_STATUS_MSG, "Done");
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, "Done");
removeProgressBar();
break;
case Notifier.NAMESPACES_UPDATED:
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NamespacesTree.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NamespacesTree.java 2005/11/06 16:47:11 1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/NamespacesTree.java 2005/11/12 16:43:47 1.7
@@ -104,7 +104,6 @@
// runs on the event-dispatching thread.
public void finished() {
- log.debug ("Rendering started");
if (updateException != null)
error (NAMESPACES_ACCESS_ERROR, updateException);
if (namespaces != null) {
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PropertyChannel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PropertyChannel.java 2005/10/28 11:30:37 1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PropertyChannel.java 2005/11/12 16:43:47 1.7
@@ -8,6 +8,7 @@
package org.biomoby.service.dashboard;
+import org.biomoby.shared.Utils;
import org.tulsoft.shared.UUtils;
import java.beans.PropertyChangeListener;
@@ -188,9 +189,9 @@
if (source != null) {
buf.append ("[");
if (source instanceof DashboardPanel)
- buf.append ( ((DashboardPanel)source).getName() );
+ buf.append ( Utils.simpleClassName (((DashboardPanel)source).getName()) );
else
- buf.append (source.getClass().getName());
+ buf.append ( Utils.simpleClassName (source.getClass().getName()) );
buf.append ("] ");
}
buf.append (key);
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationDataTypeSubPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationDataTypeSubPanel.java 2005/11/11 08:34:39 1.7
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationDataTypeSubPanel.java 2005/11/12 16:43:47 1.8
@@ -112,7 +112,7 @@
// allow to copy selected namespace to the new one
boolean usingCopyBySelect = getPrefValue (COPY_BY_SELECT_DT, false);
copyBySelect =
- createCheckBox ("Copy when selected", usingCopyBySelect, KeyEvent.VK_C,
+ createCheckBox ("Fill new Data Type when selected", usingCopyBySelect, KeyEvent.VK_C,
new ItemListener() {
public void itemStateChanged (ItemEvent e) {
onCopyBySelectDT (e.getStateChange() == ItemEvent.SELECTED);
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationNamespaceSubPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationNamespaceSubPanel.java 2005/11/11 08:34:39 1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationNamespaceSubPanel.java 2005/11/12 16:43:47 1.7
@@ -101,7 +101,7 @@
// allow to copy selected namespace to the new one
boolean usingCopyBySelect = getPrefValue (COPY_BY_SELECT_NS, false);
copyBySelect =
- createCheckBox ("Copy when selected", usingCopyBySelect, KeyEvent.VK_C,
+ createCheckBox ("Fill new Namespace when selected", usingCopyBySelect, KeyEvent.VK_C,
new ItemListener() {
public void itemStateChanged (ItemEvent e) {
onCopyBySelectNS (e.getStateChange() == ItemEvent.SELECTED);
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationServiceSubPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationServiceSubPanel.java 2005/11/11 08:34:39 1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationServiceSubPanel.java 2005/11/12 16:43:47 1.7
@@ -154,7 +154,7 @@
// copy-by-select
copyBySelect =
- createCheckBox ("Copy here when selected in browser panel",
+ createCheckBox ("Fill new Service when selected in browser panel",
false, KeyEvent.VK_C, null);
// put together service fields
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationServiceTypeSubPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationServiceTypeSubPanel.java 2005/11/10 14:32:42 1.7
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistrationServiceTypeSubPanel.java 2005/11/12 16:43:47 1.8
@@ -108,7 +108,7 @@
// allow to copy selected service types to the new one
boolean usingCopyBySelect = getPrefValue (COPY_BY_SELECT_ST, false);
copyBySelect =
- createCheckBox ("Copy when selected", usingCopyBySelect, KeyEvent.VK_O,
+ createCheckBox ("Fill new Service Type when selected", usingCopyBySelect, KeyEvent.VK_O,
new ItemListener() {
public void itemStateChanged (ItemEvent e) {
onCopyBySelectST (e.getStateChange() == ItemEvent.SELECTED);
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistryPanel.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistryPanel.java 2005/11/10 08:54:31 1.22
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/RegistryPanel.java 2005/11/12 16:43:47 1.23
@@ -202,7 +202,7 @@
final JLabel contents = new JLabel();
final String[] buttons = new String[] { "Copy to console", "Done"};
- propertyChannel.fire (DP_STATUS_MSG, "Retrieving cach info...");
+ propertyChannel.fire (DP_STATUS_MSG, "Retrieving cache info...");
infoButton.setEnabled (false);
final SwingWorker worker = new SwingWorker() {
@@ -338,7 +338,7 @@
// runs on the event-dispatching thread.
public void finished() {
if (log.isDebugEnabled())
- log.debug (myReload ? "Reload of " : "Update of part " + myCachePart + " finished");
+ log.debug ( (myReload ? "Reload of " : "Update of part ") + myCachePart + " finished");
if (exception != null)
error ("An error occured when filling/updating the cache.\n\n",
exception);
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServiceTypesBoard.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServiceTypesBoard.java 2005/11/10 08:54:31 1.5
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServiceTypesBoard.java 2005/11/12 16:43:47 1.6
@@ -58,6 +58,7 @@
CommonTree customTree) {
super (model, channel);
tree = customTree;
+ tree.setPropertyChannel (channel);
createItself();
this.model.addNotificationListener (this);
}
@@ -79,7 +80,7 @@
calibrateProgressBar ( ((Integer)event.getMessage()).intValue() );
break;
case Notifier.SERVICE_TYPE_LOADING:
- channel.fire (DashboardProperties.DP_STATUS_MSG, event.getMessage());
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, event.getMessage());
break;
case Notifier.SERVICE_TYPE_LOADED:
addToProgressBar();
@@ -89,7 +90,7 @@
case Notifier.SERVICE_TYPES_RESET:
initiator = event.getSource();
if (tree == initiator)
- channel.fire (DashboardProperties.DP_STATUS_MSG, "Done");
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, "Done");
removeProgressBar();
break;
case Notifier.SERVICE_TYPES_UPDATED:
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServiceTypesTree.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServiceTypesTree.java 2005/11/10 08:54:31 1.8
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServiceTypesTree.java 2005/11/12 16:43:47 1.9
@@ -104,7 +104,6 @@
// runs on the event-dispatching thread.
public void finished() {
- log.debug ("Rendering started");
if (updateException != null)
error (SERVICE_TYPES_ACCESS_ERROR, updateException);
if (serviceTypes != null) {
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServicesBoard.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServicesBoard.java 2005/11/10 14:32:42 1.5
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServicesBoard.java 2005/11/12 16:43:47 1.6
@@ -80,7 +80,7 @@
calibrateProgressBar ( ((Integer)event.getMessage()).intValue() );
break;
case Notifier.AUTHORITY_LOADING:
- channel.fire (DashboardProperties.DP_STATUS_MSG, event.getMessage());
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, event.getMessage());
break;
case Notifier.AUTHORITY_LOADED:
addToProgressBar();
@@ -90,7 +90,7 @@
case Notifier.AUTHORITIES_RESET:
initiator = event.getSource();
if (tree == initiator)
- channel.fire (DashboardProperties.DP_STATUS_MSG, "Done");
+ channel.fire (this, DashboardProperties.DP_STATUS_MSG, "Done");
removeProgressBar();
break;
case Notifier.AUTHORITIES_UPDATED:
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServicesTree.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServicesTree.java 2005/11/10 14:32:42 1.5
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/ServicesTree.java 2005/11/12 16:43:47 1.6
@@ -146,7 +146,6 @@
// runs on the event-dispatching thread.
public void finished() {
- log.debug ("Rendering started");
if (updateException != null)
error (SERVICES_ACCESS_ERROR, updateException);
if (services != null) {
More information about the MOBY-guts
mailing list