You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/11/22 22:41:09 UTC

svn commit: r1205185 - in /incubator/airavata/trunk/modules: commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/ commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/ gfac-core/src/main/java/org/apache...

Author: lahiru
Date: Tue Nov 22 21:41:07 2011
New Revision: 1205185

URL: http://svn.apache.org/viewvc?rev=1205185&view=rev
Log:
fixing findbug issues.

Modified:
    incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/TypesGenerator.java
    incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java
    incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/context/ContextParameters.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/SchemaCompilerUtil.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/AddAction.java

Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/TypesGenerator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/TypesGenerator.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/TypesGenerator.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/TypesGenerator.java Tue Nov 22 21:41:07 2011
@@ -44,9 +44,6 @@ public class TypesGenerator implements W
 
     public static Types addTypes(Definition def, DOMImplementation dImpl, ServiceDescriptionType serviceDesc,
             String typens, String globalTypens) {
-        ArrayList<Element> schemaTable = new ArrayList<Element>();
-        Vector complexTypes = new Vector();
-        HashMap<String, String> knownTypes = new HashMap<String, String>();
 
         Element documentation = null;
 

Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/GenericNotifierImpl.java Tue Nov 22 21:41:07 2011
@@ -75,7 +75,7 @@ public class GenericNotifierImpl extends
 
     public void debug(WorkflowTrackingContext context, String... descriptionAndAnnotation) {
         LogDebugDocument logMsg = LogDebugDocument.Factory.newInstance();
-        BaseNotificationType log = logMsg.addNewLogDebug();
+
         // add timestamp and notification source; add description, and
         // annotation if present
         sendNotification(context, logMsg, descriptionAndAnnotation, null);

Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java Tue Nov 22 21:41:07 2011
@@ -129,11 +129,11 @@ public class SSHProvider extends Abstrac
             Command cmd = session.exec(commandString.toString());
             cmd.join(COMMAND_EXECUTION_TIMEOUT, TimeUnit.SECONDS);
         } catch (ConnectionException e) {
-            new ProviderException(e.getMessage(), e);
+            throw new ProviderException(e.getMessage(), e);
         } catch (TransportException e) {
-            new ProviderException(e.getMessage(), e);
+            throw new ProviderException(e.getMessage(), e);
         } catch (IOException e) {
-            new ProviderException(e.getMessage(), e);
+            throw new ProviderException(e.getMessage(), e);
         } finally {
             closeSession(session);
         }

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/context/ContextParameters.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/context/ContextParameters.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/context/ContextParameters.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/context/ContextParameters.java Tue Nov 22 21:41:07 2011
@@ -35,38 +35,38 @@ public class ContextParameters {
 
     public static ContextParameterInfo<String> RESOURCE_ID = createParam(String.class, "resourceID");
 
-    public static ContextParameterInfo<String> SUB_ID = createParam(String.class, "subID");
+    public static final ContextParameterInfo<String> SUB_ID = createParam(String.class, "subID");
 
-    public static ContextParameterInfo<String> TOPIC_FROM_URL = createParam(String.class, "topicFromUrl");
+    public static final ContextParameterInfo<String> TOPIC_FROM_URL = createParam(String.class, "topicFromUrl");
 
-    public static ContextParameterInfo<String> SOAP_ACTION = createParam(String.class, "soapAction");
+    public static final ContextParameterInfo<String> SOAP_ACTION = createParam(String.class, "soapAction");
 
-    public static ContextParameterInfo<SubscriptionState> SUBSCRIPTION = createParam(SubscriptionState.class,
+    public static final ContextParameterInfo<SubscriptionState> SUBSCRIPTION = createParam(SubscriptionState.class,
             "subscription");
 
-    public static ContextParameterInfo<String> SUBSCRIBER_EXPIRES = createParam(String.class, "subscriberExpires");
+    public static final ContextParameterInfo<String> SUBSCRIBER_EXPIRES = createParam(String.class, "subscriberExpires");
 
     public ContextParameterInfo<String> USE_NOTIFY_TEXT = createParam(String.class, "useNotifyText");
 
-    public static ContextParameterInfo<OMElement> USE_NOTIFY_ELEMENT = createParam(OMElement.class, "useNotifyEl");
+    public static final ContextParameterInfo<OMElement> USE_NOTIFY_ELEMENT = createParam(OMElement.class, "useNotifyEl");
 
-    public static ContextParameterInfo<OMElement> NOTIFY_TO_ELEMENT = createParam(OMElement.class, "NotifyTo");
+    public static final ContextParameterInfo<OMElement> NOTIFY_TO_ELEMENT = createParam(OMElement.class, "NotifyTo");
 
-    public static ContextParameterInfo<EndpointReference> NOTIFY_TO_EPR = createParam(EndpointReference.class,
+    public static final ContextParameterInfo<EndpointReference> NOTIFY_TO_EPR = createParam(EndpointReference.class,
             "NotifyToEPR");
 
-    public static ContextParameterInfo<OMElement> SUB_POLICY = createParam(OMElement.class, "subPolicy");
+    public static final ContextParameterInfo<OMElement> SUB_POLICY = createParam(OMElement.class, "subPolicy");
 
-    public static ContextParameterInfo<OMElement> FILTER_ELEMENT = createParam(OMElement.class, "filterElement");
+    public static final ContextParameterInfo<OMElement> FILTER_ELEMENT = createParam(OMElement.class, "filterElement");
 
-    public static ContextParameterInfo<OMElement> TOPIC_EXPRESSION_ELEMENT = createParam(OMElement.class,
+    public static final ContextParameterInfo<OMElement> TOPIC_EXPRESSION_ELEMENT = createParam(OMElement.class,
             "topicExpressionEl");
 
-    public static ContextParameterInfo<OMElement> XPATH_ELEMENT = createParam(OMElement.class, "xpathEl");
+    public static final ContextParameterInfo<OMElement> XPATH_ELEMENT = createParam(OMElement.class, "xpathEl");
 
-    public static ContextParameterInfo<OMElement> SUBSCRIBE_ELEMENT = createParam(OMElement.class, "subscribeElement");
+    public static final ContextParameterInfo<OMElement> SUBSCRIBE_ELEMENT = createParam(OMElement.class, "subscribeElement");
 
-    public static ContextParameterInfo<EndpointReference> SUBSCRIBE_ELEMENT_EPR = createParam(EndpointReference.class,
+    public static final ContextParameterInfo<EndpointReference> SUBSCRIBE_ELEMENT_EPR = createParam(EndpointReference.class,
             "subscribeElement");
 
 }

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/OutGoingQueue.java Tue Nov 22 21:41:07 2011
@@ -47,18 +47,17 @@ public class OutGoingQueue {
 
         boolean loop = false;
         do {
-
             // this outgoing Queue is created inside the messenger which is
             // intended to send the notification message to the consumer.
             WSMGParameter.OUT_GOING_QUEUE.enqueue(outGoingMessage, outGoingMessage.getAdditionalMessageContent()
                     .getTrackId());
-
             if (WSMGParameter.measureMessageRate) {
                 storeToOutQueueCounter.addCounter();
             }
-
             if (WSMGParameter.testOutGoingQueueMaxiumLength && storeToOutQueueCounter.getCounterValue() < 1000000) {
                 loop = true;
+            }else{
+                loop = false;
             }
         } while (loop);
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java Tue Nov 22 21:41:07 2011
@@ -147,13 +147,13 @@ public class ApplicationDescriptionAdvan
             JPanel panel = new JPanel();
             getContentPane().add(panel, BorderLayout.CENTER);
             JLabel lblWorkingDirectory = new JLabel("Working Directory");
-            JLabel lbljobType = new JLabel("Job Type");
-            JLabel lblProjectAccountNumber = new JLabel("Project Account Number");
-            JLabel lblProjectAccountDescription = new JLabel("Project Account Description");
-            JLabel lblQueueType = new JLabel("Queue Type");
-            JLabel lblQueueName = new JLabel("Queue Name");
-            JLabel lblRSLParameterName = new JLabel("RSL Parameter Name");
-            JLabel lslRSLParameterValue = new JLabel("RSL Parameter Value");
+//            JLabel lbljobType = new JLabel("Job Type");
+//            JLabel lblProjectAccountNumber = new JLabel("Project Account Number");
+//            JLabel lblProjectAccountDescription = new JLabel("Project Account Description");
+//            JLabel lblQueueType = new JLabel("Queue Type");
+//            JLabel lblQueueName = new JLabel("Queue Name");
+//            JLabel lblRSLParameterName = new JLabel("RSL Parameter Name");
+//            JLabel lslRSLParameterValue = new JLabel("RSL Parameter Value");
             JLabel lblInputDirectory = new JLabel("Input directory");
 
             txtInputDir = new JTextField();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/BasicTypeMapping.java Tue Nov 22 21:41:07 2011
@@ -63,7 +63,7 @@ public class BasicTypeMapping {
 
     private static String[] VAR_NAMES = new String[NUM * 2];
 
-    public static QName STRING_QNAME = new QName("http://www.w3.org/2001/XMLSchema", "string");
+    public static final QName STRING_QNAME = new QName("http://www.w3.org/2001/XMLSchema", "string");
     public static QName INT_QNAME = new QName("http://www.w3.org/2001/XMLSchema", "int");
 
     /**

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/SchemaCompilerUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/SchemaCompilerUtil.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/SchemaCompilerUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/SchemaCompilerUtil.java Tue Nov 22 21:41:07 2011
@@ -90,7 +90,6 @@ public class SchemaCompilerUtil extends 
             return;
         }
 
-        args = cl.args();
         boolean verbose = (cl.getOpt("verbose") != null);
         boolean quiet = (cl.getOpt("quiet") != null);
         if (verbose)

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java Tue Nov 22 21:41:07 2011
@@ -42,8 +42,6 @@ public class SubWorkflowNode extends Nod
      */
     public SubWorkflowNode(Graph graph) {
         super(graph);
-        this.workflow = workflow;
-
     }
 
     /**

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/SystemDataPort.java Tue Nov 22 21:41:07 2011
@@ -143,7 +143,7 @@ public class SystemDataPort extends Data
                     DataPort toPort = edge.getToPort();
                     toPort.copyType(this);
                 } else {
-                    new XBayaRuntimeException();
+                    throw new XBayaRuntimeException();
                 }
             }
         }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Tue Nov 22 21:41:07 2011
@@ -264,6 +264,7 @@ public class WorkflowInterpreter {
             ArrayList<Node> inputNodes = this.getInputNodesDynamically();
             Object[] values = new Object[inputNodes.size()];
             String[] keywords = new String[inputNodes.size()];
+            //Once workflow starts read the input nodes and set the Finished color to all the input nodes.
             for (int i = 0; i < inputNodes.size(); ++i) {
                 Node node = inputNodes.get(i);
                 node.getGUI().setBodyColor(NodeState.FINISHED.color);
@@ -274,7 +275,10 @@ public class WorkflowInterpreter {
                 values[i] = ((InputNode) node).getDefaultValue();
             }
             this.notifier.workflowStarted(values, keywords);
+
+
             while (this.workflow.getExecutionState() != XBayaExecutionState.STOPPED) {
+                //When all nodes get processed.. set workflow execution
                 if (getRemainNodesDynamically() == 0) {
                     if (this.mode == GUI_MODE) {
                         this.notifyPause();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java Tue Nov 22 21:41:07 2011
@@ -80,12 +80,14 @@ public class NotificationHandler extends
         URI myWorkflowID = null;
         URI myServiceID = URI.create(XBayaConstants.APPLICATION_SHORT_NAME);
         String userDN = this.leadContext.getUserDn();
-        if (userDN != null || userDN.trim().length() == 0) {
-            String serviceIDAsString = XBayaConstants.APPLICATION_SHORT_NAME + ":" + userDN.trim();
-            try {
-                myServiceID = new URI(null, null, serviceIDAsString, null);
-            } catch (URISyntaxException e) {
-                logger.error(e.getMessage(), e);
+        if (userDN != null ){
+            if(userDN.trim().length() == 0) {
+                String serviceIDAsString = XBayaConstants.APPLICATION_SHORT_NAME + ":" + userDN.trim();
+                try {
+                    myServiceID = new URI(null, null, serviceIDAsString, null);
+                } catch (URISyntaxException e) {
+                    logger.error(e.getMessage(), e);
+                }
             }
         }
         String myNodeID = null;
@@ -133,16 +135,15 @@ public class NotificationHandler extends
         if (serviceServiceID == null) {
             serviceServiceID = URI.create("NoWorkflowIDSet");
         }
-        String serviceNodeID = this.builder.getWorkflowMonitoringContext().getWorkflowNodeId();
-        Integer serviceTimestep = null;
-        String timeStep = Integer.toString(this.builder.getWorkflowMonitoringContext().getWorkflowTimeStep());
+//        Integer serviceTimestep = null;
+/*        String timeStep = Integer.toString(this.builder.getWorkflowMonitoringContext().getWorkflowTimeStep());
         if (timeStep != null) {
             try {
                 serviceTimestep = new Integer(this.builder.getWorkflowMonitoringContext().getWorkflowTimeStep());
             } catch (NumberFormatException e) {
                 logger.error(e.getMessage(), e);
             }
-        }
+        }*/
         XmlElement soapHeader = soapEnvelope.element(null, XmlConstants.S_HEADER);
         XmlElement soapBody = soapEnvelope.element(null, XmlConstants.S_BODY);
         XmlObject headerObject = null;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java Tue Nov 22 21:41:07 2011
@@ -41,7 +41,7 @@ public class Monitor extends EventProduc
 
     protected MonitorConfiguration configuration;
 
-    protected static String DEFAULT_MODEL_KEY = "_DEFAULT_MODEL_KEY";
+    protected static final String DEFAULT_MODEL_KEY = "_DEFAULT_MODEL_KEY";
 
     protected Map<String, MonitorEventData> eventDataMap = new HashMap<String, MonitorEventData>();
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Tue Nov 22 21:41:07 2011
@@ -212,7 +212,7 @@ public class RegistryAccesser {
 
     public void main() {
 
-        XBayaConfiguration config = null;
+        XBayaConfiguration config = new XBayaConfiguration();
         config.setMyProxyServer("myproxy.teragrid.org");
         config.setMyProxyUsername("USER");
         config.setMyProxyPassphrase("PASSWORD");

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/AddAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/AddAction.java?rev=1205185&r1=1205184&r2=1205185&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/AddAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/AddAction.java Tue Nov 22 21:41:07 2011
@@ -22,7 +22,7 @@
 package org.apache.airavata.xbaya.registrybrowser.menu;
 
 public class AddAction extends AbstractBrowserActionItem {
-    public static String ID = "action.add";
+    public static final String ID = "action.add";
 
     public AddAction() {
         setCaption(getDefaultCaption());