incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmatth...@apache.org
Subject svn commit: r1239835 - in /incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher: processor/ProcessorLookup.java view/RevisionNumber.java view/VersionNumber.java
Date Thu, 02 Feb 2012 20:45:20 GMT
Author: rmatthews
Date: Thu Feb  2 20:45:20 2012
New Revision: 1239835

URL: http://svn.apache.org/viewvc?rev=1239835&view=rev
Log:
ISIS-162 - renamed revision-number to version-number.

Added:
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java
  (contents, props changed)
      - copied, changed from r1234571, incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/RevisionNumber.java
Removed:
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/RevisionNumber.java
Modified:
    incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/ProcessorLookup.java

Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/ProcessorLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/ProcessorLookup.java?rev=1239835&r1=1239834&r2=1239835&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/ProcessorLookup.java
(original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/ProcessorLookup.java
Thu Feb  2 20:45:20 2012
@@ -29,7 +29,7 @@ import org.apache.isis.viewer.scimpi.dis
 import org.apache.isis.viewer.scimpi.dispatcher.debug.DebugUsersView;
 import org.apache.isis.viewer.scimpi.dispatcher.view.HelpLink;
 import org.apache.isis.viewer.scimpi.dispatcher.view.History;
-import org.apache.isis.viewer.scimpi.dispatcher.view.RevisionNumber;
+import org.apache.isis.viewer.scimpi.dispatcher.view.VersionNumber;
 import org.apache.isis.viewer.scimpi.dispatcher.view.action.ActionButton;
 import org.apache.isis.viewer.scimpi.dispatcher.view.action.ActionForm;
 import org.apache.isis.viewer.scimpi.dispatcher.view.action.ActionLink;
@@ -176,7 +176,7 @@ public class ProcessorLookup {
         addElementProcessor(new RadioListField());
         addElementProcessor(new Redirect());
         addElementProcessor(new RemoveElement());
-        addElementProcessor(new RevisionNumber());
+        addElementProcessor(new VersionNumber());
         addElementProcessor(new RunAction());
         addElementProcessor(new ScopeTag());
         addElementProcessor(new Secure());

Copied: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java
(from r1234571, incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/RevisionNumber.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java?p2=incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java&p1=incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/RevisionNumber.java&r1=1234571&r2=1239835&rev=1239835&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/RevisionNumber.java
(original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java
Thu Feb  2 20:45:20 2012
@@ -27,25 +27,24 @@ import org.apache.isis.viewer.scimpi.dis
 import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
 import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
 
-public class RevisionNumber extends AbstractElementProcessor {
+public class VersionNumber extends AbstractElementProcessor {
 
     private static final String MARKER = "Implementation-Build: ";
     private static final String FILE = "/META-INF/MANIFEST.MF";
-    private String revision;
+    private String version;
 
     @Override
     public String getName() {
-        return "revision-number";
+        return "version-number";
     }
 
     @Override
     public void process(final Request request) {
-        if (revision == null) {
-            revision = "0000"; // default revision number
+        if (version == null) {
+            version = "0000"; // default revision number
             loadRevisonNumber(request.getContext());
-            revision = "#" + revision;
         }
-        request.appendHtml(revision);
+        request.appendHtml(version);
     }
 
     private void loadRevisonNumber(final RequestContext context) {
@@ -58,7 +57,7 @@ public class RevisionNumber extends Abst
             String line;
             while ((line = reader.readLine()) != null) {
                 if (line.startsWith(MARKER)) {
-                    revision = line.substring(MARKER.length());
+                    version = line.substring(MARKER.length());
                     break;
                 }
             }

Propchange: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/VersionNumber.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message