Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[23229] plugins/CommonControls/tags/CommonControls-1.7.1/ common
|
From: <ez...@us...> - 2013-10-02 17:25:46
|
Revision: 23229
http://jedit.svn.sourceforge.net/jedit/?rev=23229&view=rev
Author: ezust
Date: 2013-10-02 17:25:39 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
Revert 23225 so it still works with java 1.6.
Modified Paths:
--------------
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/HistoryComboBox.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/OkCancelButtons.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/PopupList.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/VFSPathFileList.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/actions/CustomAction.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/blame/BlamePaneUI.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/ClasspathFilter.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/SourceFileFilter.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/util/ConstraintFactory.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/io/ProcessExecutor.java
plugins/CommonControls/tags/CommonControls-1.7.1/common/threads/WorkerThreadPool.java
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/HistoryComboBox.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/HistoryComboBox.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/HistoryComboBox.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -2,8 +2,10 @@
import java.awt.event.*;
import javax.swing.*;
+import java.util.*;
import org.gjt.sp.jedit.*;
+import org.gjt.sp.util.*;
/** A Combo Box that remembers a given number of previous entries, even between jEdit runs.
*
@@ -13,9 +15,10 @@
*
* Should this be deprecated? I don't see the point of this class if we also have HistoryTextField.
*/
-public class HistoryComboBox extends JComboBox<String> {
+public class HistoryComboBox extends JComboBox {
+ private Stack entries;
private int entryCount;
- private DefaultComboBoxModel<String> model;
+ private DefaultComboBoxModel model;
private String propertyName;
/**
@@ -28,9 +31,10 @@
public HistoryComboBox(int entryCount, String propName) {
propertyName = propName;
setEditable(true);
- model = new DefaultComboBoxModel<String>();
+ model = new DefaultComboBoxModel();
setModel(model);
this.entryCount = entryCount;
+ entries = new Stack();
if (propertyName != null)
loadFromProperty(propertyName);
}
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/OkCancelButtons.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/OkCancelButtons.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/OkCancelButtons.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -27,6 +27,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.File;
import javax.swing.JButton;
import javax.swing.JPanel;
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/PopupList.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/PopupList.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/PopupList.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -31,7 +31,9 @@
import java.util.List;
import javax.swing.*;
+import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.View;
+import org.gjt.sp.jedit.gui.DefaultInputHandler;
import org.gjt.sp.util.Log;
// }}}
/** A popup control for displaying a arbitrary list of items.
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/VFSPathFileList.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/VFSPathFileList.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/VFSPathFileList.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.StringTokenizer;
-
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.BoxLayout;
@@ -56,9 +55,9 @@
*/
public class VFSPathFileList extends JPanel
{
- private JList<String> searchList;
+ private JList searchList;
- private DefaultListModel<String> model;
+ private DefaultListModel model;
private JButton add;
private JButton remove;
@@ -69,8 +68,8 @@
{
setBorder(BorderFactory.createEtchedBorder());
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
- model = new DefaultListModel<String>();
- searchList = new JList<String>(model);
+ model = new DefaultListModel();
+ searchList = new JList(model);
searchList.setPrototypeCellValue("a");
add = new JButton(jEdit.getProperty("common.add"));
remove = new JButton(jEdit.getProperty("common.remove"));
@@ -116,7 +115,7 @@
Collection<String> paths = new ArrayList<String>();
for (int i = 0; i < size; i++)
{
- String path = model.getElementAt(i);
+ String path = (String) model.getElementAt(i);
paths.add(path);
}
return TextUtilities.join(paths, File.pathSeparator);
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/actions/CustomAction.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/actions/CustomAction.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/actions/CustomAction.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -1,6 +1,7 @@
package common.gui.actions;
import java.awt.event.*;
+import java.net.*;
import javax.swing.*;
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/blame/BlamePaneUI.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/blame/BlamePaneUI.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/blame/BlamePaneUI.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -20,6 +20,6 @@
package common.gui.blame;
import javax.swing.plaf.ComponentUI;
-/** Base interface for BasicBlamePaneUI */
+
public abstract class BlamePaneUI extends ComponentUI {
}
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/ClasspathFilter.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/ClasspathFilter.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/ClasspathFilter.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -22,6 +22,7 @@
*/
import java.io.File;
+import java.io.IOException;
import javax.swing.filechooser.*;
public class ClasspathFilter extends FileFilter {
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/SourceFileFilter.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/SourceFileFilter.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/pathbuilder/SourceFileFilter.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -21,6 +21,7 @@
*/
import java.io.File;
+import java.io.IOException;
import javax.swing.filechooser.*;
public class SourceFileFilter extends FileFilter {
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/util/ConstraintFactory.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/util/ConstraintFactory.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/gui/util/ConstraintFactory.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -1,5 +1,6 @@
package common.gui.util;
+import javax.swing.*;
import java.awt.*;
/**
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/io/ProcessExecutor.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/io/ProcessExecutor.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/io/ProcessExecutor.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -23,6 +23,7 @@
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
Modified: plugins/CommonControls/tags/CommonControls-1.7.1/common/threads/WorkerThreadPool.java
===================================================================
--- plugins/CommonControls/tags/CommonControls-1.7.1/common/threads/WorkerThreadPool.java 2013-10-01 02:49:22 UTC (rev 23228)
+++ plugins/CommonControls/tags/CommonControls-1.7.1/common/threads/WorkerThreadPool.java 2013-10-02 17:25:39 UTC (rev 23229)
@@ -50,8 +50,8 @@
return instance;
}
- private List<Thread> threads;
- private List<WorkRequest> requests = new LinkedList<WorkRequest>();
+ private List threads;
+ private List requests = new LinkedList();
private final Object lock = new Object();
private final ThreadGroup group = new ThreadGroup("CommonControls Worker Pool");
@@ -114,7 +114,7 @@
ensureCapacity(wreqs.length);
synchronized (lock) {
int curr = 0;
- for (Iterator<Thread> i = threads.iterator();
+ for (Iterator i = threads.iterator();
curr < wreqs.length && i.hasNext(); )
{
WorkerThread wt = (WorkerThread) i.next();
@@ -142,7 +142,7 @@
{
if (threads == null)
{
- threads = new LinkedList<Thread>();
+ threads = new LinkedList();
}
while (threads.size() < size)
@@ -161,7 +161,7 @@
{
if (threads != null)
{
- for (Iterator<Thread> i = threads.iterator(); i.hasNext(); ) {
+ for (Iterator i = threads.iterator(); i.hasNext(); ) {
((WorkerThread)i.next()).requestShutdown();
i.remove();
}
@@ -211,7 +211,7 @@
{
if (requests.size() > 0)
{
- work = requests.remove(0);
+ work = (WorkRequest) requests.remove(0);
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|