svn commit: r558010 - in /incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo: advanced/MedicalScenario.java advanced/MedicalScenarioWithChangeMonitoring.java internal/DocumentSamples.java

[kelvingoodson]

Author: kelvingoodson
Date: Fri Jul 20 07:49:17 2007
New Revision: 558010

URL: http://svn.apache.org/viewvc?view=rev&rev=558010
Log:
Fix for TUSCANY-1446

Modified:
    
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
    
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
    
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java

Modified: 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java?view=diff&rev=558010&r1=558009&r2=558010
==============================================================================
--- 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
 (original)
+++ 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
 Fri Jul 20 07:49:17 2007
@@ -81,7 +81,7 @@
   
 
   private void printUsage(String[] args) {
-    System.out.println("Usage: " + this.getClass().getCanonicalName() + usage);
+    System.out.println("Usage: " + this.getClass().getName() + usage);
   }
 
   /**

Modified: 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java?view=diff&rev=558010&r1=558009&r2=558010
==============================================================================
--- 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
 (original)
+++ 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
 Fri Jul 20 07:49:17 2007
@@ -84,7 +84,7 @@
   
 
   private void printUsage(String[] args) {
-    System.out.println("Usage: " + this.getClass().getCanonicalName() + usage);
+    System.out.println("Usage: " + this.getClass().getName() + usage);
   }
 
   /**

Modified: 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java?view=diff&rev=558010&r1=558009&r2=558010
==============================================================================
--- 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
 (original)
+++ 
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
 Fri Jul 20 07:49:17 2007
@@ -132,7 +132,7 @@
     doc.append(CLASSES_HEADING);
     Class [] classes = SampleInfrastructure.sampleClasses;
     for(int i=0; i < classes.length;i++) {
-      doc.append("<h3>Sample Program " + classes[i].getSimpleName() + 
"</h3>\n");
+      doc.append("<h3>Sample Program " + getSimpleName(classes[i]) + 
"</h3>\n");
       doc.append("<b>Core function:</b><br/>\n");
       int [] functions = (int[])classToCoreFunction.get(classes[i]);
       for(int j=0;j<functions.length;j++) {
@@ -170,7 +170,7 @@
         Set classesWithFunction = (Set)coreFunctionToClass.get(fobj);
         for(Iterator cwf = classesWithFunction.iterator(); cwf.hasNext();) {
           Class c = (Class)cwf.next();
-          doc.append(c.getSimpleName()).append("<br/>\n");
+          doc.append(getSimpleName(c)).append("<br/>\n");
         }
       }
       if(significantFunctionToClass.keySet().contains(fobj)) {
@@ -178,7 +178,7 @@
         Set classesWithFunction = (Set)significantFunctionToClass.get(fobj);
         for(Iterator cwf = classesWithFunction.iterator(); cwf.hasNext();) {
           Class c = (Class)cwf.next();
-          doc.append(c.getSimpleName()).append("<br/>\n");
+          doc.append(getSimpleName(c)).append("<br/>\n");
         }
       }
       
@@ -204,5 +204,14 @@
       functionToClass.put(iobj, new HashSet());
     }
     ((Set) (functionToClass.get(iobj))).add(c);
+  }
+  
+  private String getSimpleName(Class c) {
+    String result = c.getName();
+    int lastDot = result.lastIndexOf('.');
+    if(lastDot != -1) {
+      result = result.substring(lastDot+1);
+    }
+    return result;
   }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]