[GitHub] jlahoda closed pull request #416: [NETBEANS-364] Avoiding dependency on javax.activation which appears ?

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

jlahoda closed pull request #416: [NETBEANS-364] Avoiding dependency on javax.activation which appears ?
URL: https://github.com/apache/incubator-netbeans/pull/416
 
 
   

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/openide.awt/nbproject/project.properties b/openide.awt/nbproject/project.properties
index 711d60e95..5e50a7605 100644
--- a/openide.awt/nbproject/project.properties
+++ b/openide.awt/nbproject/project.properties
@@ -17,7 +17,7 @@
 
 is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
 
diff --git a/openide.awt/src/org/openide/awt/QuickSearch.java b/openide.awt/src/org/openide/awt/QuickSearch.java
index 1b1d4e22e..49639bb69 100644
--- a/openide.awt/src/org/openide/awt/QuickSearch.java
+++ b/openide.awt/src/org/openide/awt/QuickSearch.java
@@ -21,8 +21,7 @@
 import java.awt.*;
 import java.awt.event.*;
 import java.lang.ref.WeakReference;
-import javax.activation.DataContentHandler;
-import javax.activation.DataContentHandlerFactory;
+import java.util.function.Consumer;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -295,12 +294,12 @@ private void fireShowNextSelection(boolean forward) {
         }
     }
     
-    private void findMaxPrefix(String prefix, DataContentHandlerFactory newPrefixSetter) {
+    private void findMaxPrefix(String prefix, Consumer<String> newPrefixSetter) {
         if (asynchronous) {
             rp.post(new LazyFire(QS_FIRE.MAX, prefix, newPrefixSetter));
         } else {
             prefix = callback.findMaxPrefix(prefix);
-            newPrefixSetter.createDataContentHandler(prefix);
+            newPrefixSetter.accept(prefix);
         }
     }
     
@@ -554,7 +553,7 @@ public void stopProgressAnimation() {
         //private final QuickSearchListener[] qsls;
         private final String searchText;
         private final boolean forward;
-        private final DataContentHandlerFactory newPrefixSetter;
+        private final Consumer<String> newPrefixSetter;
         
         LazyFire(QS_FIRE fire, String searchText) {
             this(fire, searchText, true, null);
@@ -569,12 +568,12 @@ public void stopProgressAnimation() {
         }
         
         LazyFire(QS_FIRE fire, String searchText,
-                 DataContentHandlerFactory newPrefixSetter) {
+                 Consumer<String> newPrefixSetter) {
             this(fire, searchText, true, newPrefixSetter);
         }
         
         LazyFire(QS_FIRE fire, String searchText, boolean forward,
-                 DataContentHandlerFactory newPrefixSetter) {
+                 Consumer<String> newPrefixSetter) {
             this.fire = fire;
             //this.qsls = qsls;
             this.searchText = searchText;
@@ -592,7 +591,7 @@ public void run() {
                 case NEXT:      callback.showNextSelection(forward);//fireShowNextSelection(qsls, forward);
                                 break;
                 case MAX:       String mp = callback.findMaxPrefix(searchText);//String mp = findMaxPrefix(qsls, searchText);
-                                newPrefixSetter.createDataContentHandler(mp);
+                                newPrefixSetter.accept(mp);
                                 break;
             }
             } finally {
@@ -770,18 +769,18 @@ public void keyPressed(KeyEvent e) {
                 // to the tree too (which scrolls)
                 e.consume();
             } else if (keyCode == KeyEvent.VK_TAB) {
-                findMaxPrefix(searchTextField.getText(), new DataContentHandlerFactory() {
+                findMaxPrefix(searchTextField.getText(), new Consumer<String>() {
                     @Override
-                    public DataContentHandler createDataContentHandler(final String maxPrefix) {
+                    public void accept(final String maxPrefix) {
                         if (!SwingUtilities.isEventDispatchThread()) {
                             SwingUtilities.invokeLater(new Runnable() {
                                 @Override
                                 public void run() {
-                                    createDataContentHandler(maxPrefix);
+                                    accept(maxPrefix);
                                     searchTextField.transferFocus();
                                 }
                             });
-                            return null;
+                            return ;
                         }
                         ignoreEvents = true;
                         try {
@@ -789,7 +788,6 @@ public void run() {
                         } finally {
                             ignoreEvents = false;
                         }
-                        return null;
                     }
                 });
 


 

----------------------------------------------------------------
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