[GitHub] emilianbold closed pull request #531: Adds the netbeans.diff.default.compact system property for a more com…

[GitBox <gi...@apache.org>]

emilianbold closed pull request #531: Adds the netbeans.diff.default.compact system property for a more com…
URL: https://github.com/apache/incubator-netbeans/pull/531
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/diff/apichanges.xml b/diff/apichanges.xml
index f678efbd8..e604a3c05 100644
--- a/diff/apichanges.xml
+++ b/diff/apichanges.xml
@@ -91,6 +91,18 @@ is the proper place.
 
   <changes>
   
+    <change id="netbeans_diff_default_compact">
+        <api name="diff"/>
+        <summary>Show compact diff with netbeans.diff.default.compact system property</summary>
+        <version major="1" minor="52"/>
+        <date day="2" month="5" year="2018"/>
+        <author login="emi"/>
+        <compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
+        <description>
+            Added the system property netbeans.diff.default.compact which instructs the default DiffControllerProvider to
+            show only the graphical diff (instead of the tabbed pane with the graphical and textual diffs).
+        </description>
+    </change>
     <change id="diff-api">
       <api name="diff"/>
       <summary>The Diff APIs created</summary>
diff --git a/diff/src/org/netbeans/modules/diff/builtin/DefaultDiffControllerProvider.java b/diff/src/org/netbeans/modules/diff/builtin/DefaultDiffControllerProvider.java
index e9b47fa27..0d8ad5193 100644
--- a/diff/src/org/netbeans/modules/diff/builtin/DefaultDiffControllerProvider.java
+++ b/diff/src/org/netbeans/modules/diff/builtin/DefaultDiffControllerProvider.java
@@ -39,6 +39,9 @@ public DiffControllerImpl createDiffController(StreamSource base, StreamSource m
 
     @Override
     public DiffControllerImpl createEnhancedDiffController(StreamSource base, StreamSource modified) throws IOException {
+        if (Boolean.getBoolean("netbeans.diff.default.compact")) {
+            return createDiffController(base, modified);
+        }
         return new EditableDiffView(base, modified, true);
     }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists