Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[23222] jEdit/trunk/org
|
From: <sh...@us...> - 2013-09-29 20:43:43
|
Revision: 23222
http://jedit.svn.sourceforge.net/jedit/?rev=23222&view=rev
Author: shlomy
Date: 2013-09-29 20:43:34 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
Some more enhancements suggested by IntelliJIDEA.
Modified Paths:
--------------
jEdit/trunk/org/gjt/sp/jedit/View.java
jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java
jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java
jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java
jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java
jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java
jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java
jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java
jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java
jEdit/trunk/org/gjt/sp/jedit/jEdit.java
jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java
jEdit/trunk/org/gjt/sp/jedit/options/ShortcutsOptionPane.java
jEdit/trunk/org/gjt/sp/jedit/options/SyntaxHiliteOptionPane.java
jEdit/trunk/org/gjt/sp/jedit/options/ToolBarOptionPane.java
jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
jEdit/trunk/org/gjt/sp/jedit/search/SearchAndReplace.java
jEdit/trunk/org/gjt/sp/jedit/textarea/AntiAlias.java
jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java
jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java
jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java
jEdit/trunk/org/gjt/sp/util/PropertiesBean.java
jEdit/trunk/org/gjt/sp/util/StringList.java
jEdit/trunk/org/gjt/sp/util/StringModel.java
jEdit/trunk/org/jedit/keymap/EmacsUtil.java
jEdit/trunk/org/jedit/options/OptionGroupPane.java
jEdit/trunk/org/jedit/options/TabbedOptionDialog.java
Modified: jEdit/trunk/org/gjt/sp/jedit/View.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/View.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/View.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -1211,10 +1211,10 @@
{
List<Buffer> buffers = new ArrayList<Buffer>();
EditPane[] editPanes = getEditPanes();
- for(int i = 0; i < editPanes.length; i++)
+ for (EditPane ep : editPanes)
{
- Buffer buffer = editPanes[i].getBuffer();
- if(!buffers.contains(buffer))
+ Buffer buffer = ep.getBuffer();
+ if (!buffers.contains(buffer))
buffers.add(buffer);
}
@@ -1289,9 +1289,8 @@
public void visit(JEditVisitor visitor)
{
EditPane[] panes = getEditPanes();
- for (int i = 0; i < panes.length; i++)
+ for (EditPane editPane : panes)
{
- EditPane editPane = panes[i];
visitor.visit(editPane);
visitor.visit(editPane.getTextArea());
}
@@ -1486,8 +1485,8 @@
dispose();
EditPane[] editPanes = getEditPanes();
- for(int i = 0; i < editPanes.length; i++)
- editPanes[i].close();
+ for (EditPane ep : editPanes)
+ ep.close();
// null some variables so that retaining references
// to closed views won't hurt as much.
@@ -1606,10 +1605,9 @@
}
EditPane[] editPanes = getEditPanes();
- for(int i = 0; i < editPanes.length; i++)
+ for (EditPane ep : editPanes)
{
- EditPane ep = editPanes[i];
- if(ep.getBuffer() == buffer
+ if (ep.getBuffer() == buffer
/* ignore zero-height splits, etc */
&& ep.getTextArea().getVisibleLines() > 1)
{
@@ -2028,9 +2026,9 @@
|| msg.getWhat() == BufferUpdate.LOADED)
{
EditPane[] editPanes = getEditPanes();
- for(int i = 0; i < editPanes.length; i++)
+ for (EditPane ep : editPanes)
{
- if(editPanes[i].getBuffer() == buffer)
+ if (ep.getBuffer() == buffer)
{
updateTitle();
break;
@@ -2115,8 +2113,8 @@
private void updateGutterBorders()
{
EditPane[] editPanes = getEditPanes();
- for(int i = 0; i < editPanes.length; i++)
- editPanes[i].getTextArea().getGutter().updateBorder();
+ for (EditPane editPane : editPanes)
+ editPane.getTextArea().getGutter().updateBorder();
} //}}}
//{{{ getOpenBuffers() method
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/BrowserCommandsMenu.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -269,16 +269,13 @@
Collections.sort(encodingMenuItemList,
new MenuItemTextComparator());
- Iterator iter = encodingMenuItemList.iterator();
- while(iter.hasNext())
+ for (JMenuItem item : encodingMenuItemList)
{
- JRadioButtonMenuItem mi = (JRadioButtonMenuItem)
- iter.next();
+ JRadioButtonMenuItem mi = (JRadioButtonMenuItem) item;
- if(menu.getMenuComponentCount() > 20)
+ if (menu.getMenuComponentCount() > 20)
{
- JMenu newMenu = new JMenu(
- jEdit.getProperty("common.more"));
+ JMenu newMenu = new JMenu(jEdit.getProperty("common.more"));
menu.add(newMenu);
menu = newMenu;
}
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -1165,8 +1165,8 @@
if (!vec.isEmpty())
{
Collections.sort(vec,new MenuItemTextComparator());
- for(int i = 0; i < vec.size(); i++)
- pluginMenu.add(vec.get(i));
+ for (JMenuItem item : vec)
+ pluginMenu.add(item);
}
else
{
@@ -1210,59 +1210,54 @@
Buffer buffer = null;
-check_selected: for(int i = 0; i < selectedFiles.length; i++)
+check_selected:
+ for (VFSFile file : selectedFiles)
{
- VFSFile file = selectedFiles[i];
-
- if(file.getType() == VFSFile.DIRECTORY
- || file.getType() == VFSFile.FILESYSTEM)
+ if (file.getType() == VFSFile.DIRECTORY ||
+ file.getType() == VFSFile.FILESYSTEM)
{
- if(mode == M_OPEN_NEW_VIEW && this.mode == BROWSER)
- browseDirectoryInNewWindow(view,file.getPath());
- else
- if (selectedFiles.length == 1)
- setDirectory(file.getPath());
+ if (mode == M_OPEN_NEW_VIEW && this.mode == BROWSER)
+ browseDirectoryInNewWindow(view, file.getPath());
+ else if (selectedFiles.length == 1)
+ setDirectory(file.getPath());
}
- else if(this.mode == BROWSER || this.mode == BROWSER_DIALOG)
+ else if (this.mode == BROWSER || this.mode == BROWSER_DIALOG)
{
- if(mode == M_INSERT)
+ if (mode == M_INSERT)
{
- view.getBuffer().insertFile(view,
- file.getPath());
+ view.getBuffer().insertFile(view, file.getPath());
continue check_selected;
}
Buffer _buffer = jEdit.getBuffer(file.getPath());
- if(_buffer == null)
+ if (_buffer == null)
{
Hashtable<String, Object> props = new Hashtable<String, Object>();
- if(currentEncoding != null)
+ if (currentEncoding != null)
{
- props.put(JEditBuffer.ENCODING,currentEncoding);
+ props.put(JEditBuffer.ENCODING, currentEncoding);
}
- props.put(Buffer.ENCODING_AUTODETECT,
- autoDetectEncoding);
- _buffer = jEdit.openFile(view, null,
- file.getPath(),false,props);
+ props.put(Buffer.ENCODING_AUTODETECT, autoDetectEncoding);
+ _buffer = jEdit.openFile(view, null, file.getPath(), false, props);
}
- else if(doubleClickClose && canDoubleClickClose
- && this.mode != BROWSER_DIALOG
- && selectedFiles.length == 1)
+ else if (doubleClickClose && canDoubleClickClose &&
+ this.mode != BROWSER_DIALOG &&
+ selectedFiles.length == 1)
{
// close if this buffer is currently
// visible in the view.
EditPane[] editPanes = view.getEditPanes();
- for(int j = 0; j < editPanes.length; j++)
+ for (EditPane editPane : editPanes)
{
- if(editPanes[j].getBuffer() == _buffer)
+ if (editPane.getBuffer() == _buffer)
{
- jEdit.closeBuffer(view,_buffer);
+ jEdit.closeBuffer(view, _buffer);
return;
}
}
}
- if(_buffer != null)
+ if (_buffer != null)
buffer = _buffer;
}
else
@@ -1393,23 +1388,23 @@
{
VFSFileFilter filter = getVFSFileFilter();
- for(int i = 0; i < list.length; i++)
+ for (VFSFile file : list)
{
- VFSFile file = list[i];
- if(file.isHidden() && !showHiddenFiles)
+ if (file.isHidden() && !showHiddenFiles)
{
invisible++;
continue;
}
- if (filter != null && (filterEnabled || filter instanceof DirectoriesOnlyFilter)
+ if (filter != null &&
+ (filterEnabled || filter instanceof DirectoriesOnlyFilter)
&& !filter.accept(file))
{
invisible++;
continue;
}
- if(file.getType() == VFSFile.FILE)
+ if (file.getType() == VFSFile.FILE)
files++;
else
directories++;
@@ -1447,11 +1442,10 @@
if(mode == BROWSER)
{
- for(int i = 0; i < selectedFiles.length; i++)
+ for (VFSFile file : selectedFiles)
{
- VFSFile file = selectedFiles[i];
Buffer buffer = jEdit.getBuffer(file.getPath());
- if(buffer != null && view != null)
+ if (buffer != null && view != null)
view.setBuffer(buffer);
}
}
@@ -1999,10 +1993,10 @@
}
else
{
- for(int i = 0; i < selected.length; i++)
+ for (VFSFile file : selected)
{
- VFSFile file = selected[i];
- FavoritesVFS.addToFavorites(file.getPath(),
+ FavoritesVFS.addToFavorites(
+ file.getPath(),
file.getType());
}
}
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSDirectoryEntryTable.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -126,10 +126,8 @@
java.util.List<VFSFile> returnValue = new LinkedList<VFSFile>();
int[] selectedRows = getSelectedRows();
- for(int i = 0; i < selectedRows.length; i++)
- {
- returnValue.add(model.files[selectedRows[i]].dirEntry);
- }
+ for (int selectedRow : selectedRows)
+ returnValue.add(model.files[selectedRow].dirEntry);
return returnValue.toArray(new VFSFile[returnValue.size()]);
} //}}}
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -409,10 +409,9 @@
{
List<String> l = new ArrayList<String>();
VFSFile[] selectedFiles = browser.getSelectedFiles();
- for(int i = 0; i < selectedFiles.length; i++)
+ for (VFSFile file : selectedFiles)
{
- VFSFile file = selectedFiles[i];
- if(file.getType() == type1 || file.getType() == type2)
+ if (file.getType() == type1 || file.getType() == type2)
l.add(file.getPath());
}
return l.toArray(new String[l.size()]);
Modified: jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/bsh/StringUtil.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -49,8 +49,8 @@
public static String [] bubbleSort( String [] in ) {
Vector v = new Vector();
- for(int i=0; i<in.length; i++)
- v.addElement(in[i]);
+ for (String element : in)
+ v.addElement(element);
int n = v.size();
boolean swap = true;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -222,13 +222,11 @@
public void applyDockingLayout(DockingLayout docking)
{
// By default, use the docking positions specified by the jEdit properties
- Iterator<Entry<String, String>> iterator = positions.entrySet().iterator();
- while (iterator.hasNext())
+ for (Entry<String, String> entry : positions.entrySet())
{
- Entry<String, String> entry = iterator.next();
String dockable = entry.getKey();
String position = entry.getValue();
- if (! position.equals(FLOATING))
+ if (!position.equals(FLOATING))
showDockableWindow(dockable);
}
} //}}}
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -1153,13 +1153,11 @@
int gridRowsSize = gridRows.size();
if (gridRowsSize > 0)
{
- ListIterator<ExtendedGridLayoutConstraints> gridRowIterator = gridRows.get(gridRows.size()-1).listIterator();
- while (gridRowIterator.hasNext())
+ for (ExtendedGridLayoutConstraints cell :
+ gridRows.get(gridRows.size() - 1))
{
- ExtendedGridLayoutConstraints cell = gridRowIterator.next();
- if ((null != cell) &&
- ((REMAINDER != cell.getRowspan()) &&
- (null != cell.getRowspanPlaceholder(false))))
+ if ((null != cell) && ((REMAINDER != cell.getRowspan())
+ && (null != cell.getRowspanPlaceholder(false))))
{
haveNext = true;
break;
@@ -1168,7 +1166,8 @@
while (haveNext)
{
haveNext = false;
- gridRowIterator = gridRows.get(gridRows.size()-1).listIterator();
+ ListIterator<ExtendedGridLayoutConstraints> gridRowIterator =
+ gridRows.get(gridRows.size()-1).listIterator();
List<ExtendedGridLayoutConstraints> gridRow = new ArrayList<ExtendedGridLayoutConstraints>();
gridRows.add(gridRow);
ListIterator<ExtendedGridLayoutConstraints> newGridRowIterator = gridRow.listIterator();
Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFS.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFS.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -1114,10 +1114,9 @@
if(colors == null)
loadColors();
- for(int i = 0; i < colors.size(); i++)
+ for (ColorEntry entry : colors)
{
- ColorEntry entry = colors.get(i);
- if(entry.re.matcher(name).matches())
+ if (entry.re.matcher(name).matches())
return entry.color;
}
Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -151,12 +151,7 @@
List<String> returnValue = new LinkedList<String>();
String[] newAPI = ServiceManager.getServiceNames(SERVICE);
if(newAPI != null)
- {
- for(int i = 0; i < newAPI.length; i++)
- {
- returnValue.add(newAPI[i]);
- }
- }
+ Collections.addAll(returnValue, newAPI);
return returnValue.toArray(new String[returnValue.size()]);
} //}}}
@@ -324,10 +319,9 @@
synchronized(vfsUpdateLock)
{
- for(int i = 0; i < vfsUpdates.size(); i++)
+ for (VFSUpdate msg : vfsUpdates)
{
- VFSUpdate msg = vfsUpdates.get(i);
- if(msg.getPath().equals(path))
+ if (msg.getPath().equals(path))
{
// don't send two updates
// for the same path
@@ -363,10 +357,8 @@
Collections.sort(vfsUpdates,
new StandardUtilities.StringCompare<VFSUpdate>()
);
- for(int i = 0; i < vfsUpdates.size(); i++)
- {
- EditBus.send(vfsUpdates.get(i));
- }
+ for (VFSUpdate vfsUpdate : vfsUpdates)
+ EditBus.send(vfsUpdate);
vfsUpdates.clear();
}
Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -1505,21 +1505,20 @@
Buffer retVal = null;
Buffer lastBuffer = null;
- for(int i = 0; i < args.length; i++)
+ for (String arg : args)
{
- String arg = args[i];
- if(arg == null)
+ if (arg == null)
continue;
- else if(arg.startsWith("+line:") || arg.startsWith("+marker:"))
+ else if (arg.startsWith("+line:") || arg.startsWith("+marker:"))
{
- if(lastBuffer != null)
- gotoMarker(view,lastBuffer,arg);
+ if (lastBuffer != null)
+ gotoMarker(view, lastBuffer, arg);
continue;
}
- lastBuffer = openFile((View)null,parent,arg,false,null);
+ lastBuffer = openFile((View) null, parent, arg, false, null);
- if(retVal == null && lastBuffer != null)
+ if (retVal == null && lastBuffer != null)
retVal = lastBuffer;
}
@@ -3680,10 +3679,8 @@
}
PluginJAR[] jars = getPluginJARs();
- for(int i = 0; i < jars.length; i++)
- {
- jars[i].checkDependencies();
- }
+ for (PluginJAR jar : jars)
+ jar.checkDependencies();
} //}}}
//{{{ initUserProperties() method
@@ -4596,10 +4593,8 @@
inputHandler.removeAllKeyBindings();
ActionSet[] actionSets = getActionSets();
- for (int i = 0; i < actionSets.length; i++)
- {
- actionSets[i].initKeyBindings();
- }
+ for (ActionSet actionSet : actionSets)
+ actionSet.initKeyBindings();
} //}}}
//{{{ composeBufferPropsFromHistory() method
Modified: jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/menu/PluginsProvider.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -74,24 +74,18 @@
}
// Sort each letter
- for(int i = 0; i < letters.length; i++)
- {
- Collections.sort(letters[i],new MenuItemTextComparator());
- }
+ for (List<JMenuItem> letter1 : letters)
+ Collections.sort(letter1, new MenuItemTextComparator());
int maxItems = jEdit.getIntegerProperty("menu.spillover",20);
// if less than 20 items, put them directly in the menu
if(count <= maxItems)
{
- for(int i = 0; i < letters.length; i++)
+ for (List<JMenuItem> items : letters)
{
- Iterator<JMenuItem> iter
- = letters[i].iterator();
- while(iter.hasNext())
- {
- menu.add(iter.next());
- }
+ for (JMenuItem item : items)
+ menu.add(item);
}
return;
@@ -119,15 +113,14 @@
submenu = null;
}
- Iterator<JMenuItem> iter = letter.iterator();
- while(iter.hasNext())
+ for (JMenuItem item : letter)
{
- if(submenu == null)
+ if (submenu == null)
{
submenu = new JMenu();
menu.add(submenu);
}
- submenu.add(iter.next());
+ submenu.add(item);
}
count += letter.size();
Modified: jEdit/trunk/org/gjt/sp/jedit/options/ShortcutsOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/ShortcutsOptionPane.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/options/ShortcutsOptionPane.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -298,17 +298,16 @@
{
List<KeyBinding[]> bindings = new ArrayList<>(actions.length);
- for(int i = 0; i < actions.length; i++)
+ for (String name : actions)
{
- String name = actions[i];
EditAction ea = jEdit.getAction(name);
String label = ea.getLabel();
// Skip certain actions this way
- if(label == null)
+ if (label == null)
continue;
label = GUIUtilities.prettifyMenuLabel(label);
- addBindings(actionSet, name,label,bindings);
+ addBindings(actionSet, name, label, bindings);
}
return new ShortcutsModel(modelLabel,bindings);
Modified: jEdit/trunk/org/gjt/sp/jedit/options/SyntaxHiliteOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/SyntaxHiliteOptionPane.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/options/SyntaxHiliteOptionPane.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -217,12 +217,10 @@
//{{{ save() method
public void save()
{
- for(int i = 0; i < styleChoices.size(); i++)
+ for (StyleChoice ch : styleChoices)
{
- StyleChoice ch = styleChoices
- .get(i);
jEdit.setProperty(ch.property,
- GUIUtilities.getStyleString(ch.style));
+ GUIUtilities.getStyleString(ch.style));
}
} //}}}
Modified: jEdit/trunk/org/gjt/sp/jedit/options/ToolBarOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/ToolBarOptionPane.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/options/ToolBarOptionPane.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -473,16 +473,13 @@
String selectedActionSet = jEdit.getProperty("options.toolbar.selectedActionSet");
ActionSet selectedItem = null;
Vector<ActionSet> vec = new Vector<ActionSet>(actionsList.length);
- for(int i = 0; i < actionsList.length; i++)
+ for (ActionSet actionSet : actionsList)
{
- ActionSet actionSet = actionsList[i];
- if(actionSet.getActionCount() != 0)
+ if (actionSet.getActionCount() != 0)
{
vec.add(actionSet);
if (actionSet.getLabel().equals(selectedActionSet))
- {
selectedItem = actionSet;
- }
}
}
Collections.sort(vec, new ActionSetCompare());
@@ -705,15 +702,14 @@
EditAction[] actions = actionSet.getActions();
Vector<ToolBarOptionPane.Button> listModel = new Vector<ToolBarOptionPane.Button>(actions.length);
- for(int i = 0; i < actions.length; i++)
+ for (EditAction action : actions)
{
- EditAction action = actions[i];
String label = action.getLabel();
- if(label == null)
+ if (label == null)
continue;
- listModel.add(new ToolBarOptionPane.Button(
- action.getName(),null,null,label));
+ listModel.add(new ToolBarOptionPane.Button(action.getName(),
+ null, null, label));
}
Collections.sort(listModel,new ToolBarOptionPane.ButtonCompare());
Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -87,13 +87,12 @@
//{{{ performOperationsInWorkThread() method
void performOperationsInWorkThread(PluginManagerProgress progress)
{
- for(int i = 0; i < operations.size(); i++)
+ for (Operation op : operations)
{
- Operation op = operations.get(i);
op.runInWorkThread(progress);
progress.done();
- if(Thread.interrupted())
+ if (Thread.interrupted())
return;
}
} //}}}
@@ -101,40 +100,31 @@
//{{{ performOperationsInAWTThread() method
void performOperationsInAWTThread(Component comp)
{
- for(int i = 0; i < operations.size(); i++)
- {
- Operation op = operations.get(i);
+ for (Operation op : operations)
op.runInAWTThread(comp);
- }
// add the JARs before checking deps since dep check might
// require all JARs to be present
- for(int i = 0; i < toLoad.size(); i++)
+ for (String pluginName : toLoad)
{
- String pluginName = toLoad.get(i);
- if(jEdit.getPluginJAR(pluginName) != null)
- {
- Log.log(Log.WARNING,this,"Already loaded: "
- + pluginName);
- }
+ if (jEdit.getPluginJAR(pluginName) != null)
+ Log.log(Log.WARNING, this, "Already loaded: " + pluginName);
else
jEdit.addPluginJAR(pluginName);
}
- for(int i = 0; i < toLoad.size(); i++)
+ for (String pluginName : toLoad)
{
- String pluginName = toLoad.get(i);
PluginJAR plugin = jEdit.getPluginJAR(pluginName);
- if(plugin != null)
+ if (plugin != null)
plugin.checkDependencies();
}
// now activate the plugins
- for(int i = 0; i < toLoad.size(); i++)
+ for (String pluginName : toLoad)
{
- String pluginName = toLoad.get(i);
PluginJAR plugin = jEdit.getPluginJAR(pluginName);
- if(plugin != null)
+ if (plugin != null)
plugin.activatePluginIfNecessary();
}
} //}}}
@@ -148,9 +138,9 @@
//{{{ addOperation() method
private void addOperation(Operation op)
{
- for(int i = 0; i < operations.size(); i++)
+ for (Operation operation : operations)
{
- if(operations.get(i).equals(op))
+ if (operation.equals(op))
return;
}
Modified: jEdit/trunk/org/gjt/sp/jedit/search/SearchAndReplace.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/SearchAndReplace.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/search/SearchAndReplace.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -743,12 +743,11 @@
int retVal = 0;
- for(int i = 0; i < selection.length; i++)
+ for (Selection aSelection : selection)
{
- s = selection[i];
-
- retVal += replaceInSelection(view,textArea,
- buffer,matcher,smartCaseReplace,s);
+ s = aSelection;
+ retVal += replaceInSelection(view, textArea, buffer,
+ matcher, smartCaseReplace, s);
}
if(reverse)
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/AntiAlias.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/AntiAlias.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/AntiAlias.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -106,7 +106,7 @@
public String toString()
{
- return comboChoices[m_val].toString();
+ return comboChoices[m_val];
}
public int val()
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -90,10 +90,9 @@
{
if(selection != null)
{
- for(int i = 0; i < selection.length; i++)
+ for (Selection s : selection)
{
- Selection s = selection[i];
- if(s != null)
+ if (s != null)
addToSelection(s);
}
}
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/StandaloneTextArea.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -515,13 +515,13 @@
"folding",
"collapseFolds"
};
- for (int i = 0; i < bufferProperties.length; i++)
+ for (String bufferProperty : bufferProperties)
{
- String value = getProperty("buffer." + bufferProperties[i]);
+ String value = getProperty("buffer." + bufferProperty);
if (value == null)
- buffer.unsetProperty(bufferProperties[i]);
+ buffer.unsetProperty(bufferProperty);
else
- buffer.setProperty(bufferProperties[i], value);
+ buffer.setProperty(bufferProperty, value);
}
buffer.propertiesChanged();
} // }}}
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -2082,8 +2082,8 @@
buffer.beginCompoundEdit();
Selection[] selection = getSelection();
- for(int i = 0; i < selection.length; i++)
- newCaret = selection[i].setText(buffer,selectedText);
+ for (Selection aSelection : selection)
+ newCaret = aSelection.setText(buffer, selectedText);
}
finally
{
@@ -4075,10 +4075,12 @@
Selection[] selections = getSelection();
Selection selection = null;
int caretBack = 0;
- for (int i = 0; i < selections.length; i++)
+ for (Selection selection1 : selections)
{
- selection = selections[i];
- caretBack = addExplicitFold(selection.start, selection.end, selection.startLine,selection.endLine);
+ selection = selection1;
+ caretBack = addExplicitFold(selection.start,
+ selection.end, selection.startLine,
+ selection.endLine);
}
// Selection cannot be null because there is at least 1 selection
assert selection != null;
@@ -4121,12 +4123,11 @@
try
{
- for(int i = 0; i < lines.length; i++)
+ for (int line : lines)
{
- String text = getLineText(lines[i]);
- buffer.insert(getLineStartOffset(lines[i])
- + StandardUtilities.getLeadingWhiteSpace(text),
- comment);
+ String text = getLineText(line);
+ buffer.insert(getLineStartOffset(line) +
+ StandardUtilities.getLeadingWhiteSpace(text), comment);
}
}
finally
@@ -4171,26 +4172,23 @@
setCaretPosition(oldCaret + commentStart.length());
}
- for(int i = 0; i < selection.length; i++)
+ for (Selection s : selection)
{
- Selection s = selection[i];
- if(s instanceof Selection.Range)
+ if (s instanceof Selection.Range)
{
- buffer.insert(s.start,commentStart);
- buffer.insert(s.end,commentEnd);
+ buffer.insert(s.start, commentStart);
+ buffer.insert(s.end, commentEnd);
}
- else if(s instanceof Selection.Rect)
+ else if (s instanceof Selection.Rect)
{
- Selection.Rect rect = (Selection.Rect)s;
+ Selection.Rect rect = (Selection.Rect) s;
int start = rect.getStartColumn(buffer);
int end = rect.getEndColumn(buffer);
- for(int j = s.startLine; j <= s.endLine; j++)
+ for (int j = s.startLine; j <= s.endLine; j++)
{
- buffer.insertAtColumn(j,end,
- commentEnd);
- buffer.insertAtColumn(j,start,
- commentStart);
+ buffer.insertAtColumn(j, end, commentEnd);
+ buffer.insertAtColumn(j, start, commentStart);
}
}
}
@@ -4226,12 +4224,10 @@
{
buffer.beginCompoundEdit();
- for(int i = 0; i < selection.length; i++)
+ for (Selection s : selection)
{
- Selection s = selection[i];
- setSelectedText(s,TextUtilities.format(
- getSelectedText(s),maxLineLen,
- buffer.getTabSize()));
+ setSelectedText(s, TextUtilities.format(getSelectedText(s), maxLineLen,
+ buffer.getTabSize()));
}
buffer.endCompoundEdit();
@@ -4312,11 +4308,10 @@
}
else
{
- for(int i = 0; i < selection.length; i++)
+ for (Selection s : selection)
{
- Selection s = selection[i];
- setSelectedText(s,TextUtilities.spacesToTabs(
- getSelectedText(s),buffer.getTabSize()));
+ setSelectedText(s, TextUtilities.spacesToTabs(
+ getSelectedText(s), buffer.getTabSize()));
}
}
@@ -4347,11 +4342,10 @@
}
else
{
- for(int i = 0; i < selection.length; i++)
+ for (Selection s : selection)
{
- Selection s = selection[i];
setSelectedText(s, TextUtilities.tabsToSpaces(
- getSelectedText(s),buffer.getTabSize()));
+ getSelectedText(s), buffer.getTabSize()));
}
}
@@ -4389,11 +4383,8 @@
buffer.beginCompoundEdit();
- for(int i = 0; i < selection.length; i++)
- {
- Selection s = selection[i];
- setSelectedText(s,getSelectedText(s).toUpperCase());
- }
+ for (Selection s : selection)
+ setSelectedText(s, getSelectedText(s).toUpperCase());
buffer.endCompoundEdit();
if (caret != -1)
@@ -4431,11 +4422,8 @@
buffer.beginCompoundEdit();
- for (int i = 0; i < selection.length; i++)
- {
- Selection s = selection[i];
- setSelectedText(s,getSelectedText(s).toLowerCase());
- }
+ for (Selection s : selection)
+ setSelectedText(s, getSelectedText(s).toLowerCase());
buffer.endCompoundEdit();
if (caret != -1)
@@ -6103,16 +6091,15 @@
{
buffer.beginCompoundEdit();
int[] lines = getSelectedLines();
- for(int i = 0; i < lines.length; i++)
+ for (int line : lines)
{
- String text = getLineText(lines[i]);
+ String text = getLineText(line);
if (text.trim().length() == 0)
continue;
- buffer.insert(getLineEndOffset(lines[i]) - 1,
- commentEnd);
- buffer.insert(getLineStartOffset(lines[i])
- + StandardUtilities.getLeadingWhiteSpace(text),
- commentStart);
+ buffer.insert(getLineEndOffset(line) - 1, commentEnd);
+ buffer.insert(getLineStartOffset(line) +
+ StandardUtilities.getLeadingWhiteSpace(text),
+ commentStart);
}
}
finally
Modified: jEdit/trunk/org/gjt/sp/util/PropertiesBean.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/PropertiesBean.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/util/PropertiesBean.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -92,18 +92,18 @@
try
{
PropertyDescriptor[] _props = getPropertyDescriptors();
- for (int i = 0; i < _props.length; i++)
+ for (PropertyDescriptor prop : _props)
{
- if ("class".equals(_props[i].getName()))
+ if ("class".equals(prop.getName()))
continue;
- Method _set = _props[i].getWriteMethod();
+ Method _set = prop.getWriteMethod();
if (_set != null)
{
- String _pname = root + "." + _props[i].getName();
+ String _pname = root + "." + prop.getName();
Object _val = p.getProperty(_pname);
if (_val != null)
- _val = parse((String)_val, _props[i].getPropertyType());
+ _val = parse((String) _val, prop.getPropertyType());
try
{
_set.invoke(this, _val);
@@ -132,20 +132,17 @@
try
{
PropertyDescriptor[] _props = getPropertyDescriptors();
- for (int i = 0; i < _props.length; i++)
+ for (PropertyDescriptor prop : _props)
{
- if ("class".equals(_props[i].getName()))
- continue;
+ if ("class".equals(prop.getName())) continue;
- Method _get = _props[i].getReadMethod();
+ Method _get = prop.getReadMethod();
if (_get != null)
{
Object _val = _get.invoke(this);
- String _pname = root + "." + _props[i].getName();
- if (_val != null)
- p.setProperty(_pname, encode(_val));
- else
- p.remove(_pname);
+ String _pname = root + "." + prop.getName();
+ if (_val != null) p.setProperty(_pname, encode(_val));
+ else p.remove(_pname);
}
}
}
@@ -167,12 +164,11 @@
try
{
PropertyDescriptor[] _props = getPropertyDescriptors();
- for (int i = 0; i < _props.length; i++)
+ for (PropertyDescriptor prop : _props)
{
- if ("class".equals(_props[i].getName()))
- continue;
+ if ("class".equals(prop.getName())) continue;
- String _pname = root + "." + _props[i].getName();
+ String _pname = root + "." + prop.getName();
p.remove(_pname);
}
}
Modified: jEdit/trunk/org/gjt/sp/util/StringList.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/StringList.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/util/StringList.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -49,10 +49,8 @@
// {{{ addAll()
public void addAll(Object[] array)
{
- for (int i = 0; i < array.length; ++i)
- {
- add(array[i].toString());
- }
+ for (Object element : array)
+ add(element.toString());
} // }}}
// {{{ split()
Modified: jEdit/trunk/org/gjt/sp/util/StringModel.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/StringModel.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/gjt/sp/util/StringModel.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -32,11 +32,8 @@
void fireTextChanged()
{
TextEvent te = new TextEvent(this, TextEvent.TEXT_VALUE_CHANGED);
- Iterator<TextListener> itr = listeners.iterator();
- while (itr.hasNext())
- {
- itr.next().textValueChanged(te);
- }
+ for (TextListener listener : listeners)
+ listener.textValueChanged(te);
}
public String toString()
Modified: jEdit/trunk/org/jedit/keymap/EmacsUtil.java
===================================================================
--- jEdit/trunk/org/jedit/keymap/EmacsUtil.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/jedit/keymap/EmacsUtil.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -114,17 +114,17 @@
public String lineAt (int i)
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while (! atEndOfBuffer (i))
{
char c = charAt (i);
- buf.append (c);
+ sb.append(c);
if (c == '\n')
break;
}
- return buf.toString();
+ return sb.toString();
}
public char charAt (int i)
@@ -222,7 +222,7 @@
public String makeBufferPropertyName (Buffer theBuffer, String prefix)
{
- StringBuffer propName = new StringBuffer (prefix);
+ StringBuilder propName = new StringBuilder(prefix);
// Convert any Windows-style file separators to Unix ones, since
// backslashes are special characters in properties files.
Modified: jEdit/trunk/org/jedit/options/OptionGroupPane.java
===================================================================
--- jEdit/trunk/org/jedit/options/OptionGroupPane.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/jedit/options/OptionGroupPane.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -125,7 +125,7 @@
Object[] nodes = path.getPath();
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
OptionPane optionPane = null;
@@ -178,17 +178,17 @@
continue;
}
if (label != null)
- buf.append(label);
+ sb.append(label);
if (i > 0 && i < lastIdx)
- buf.append(": ");
+ sb.append(": ");
}
if (optionPane == null)
return;
String ttext = jEdit.getProperty("optional.title-template", new Object[] {
- optionGroup.getName(), buf.toString() });
+ optionGroup.getName(), sb.toString() });
setTitle(ttext);
try
Modified: jEdit/trunk/org/jedit/options/TabbedOptionDialog.java
===================================================================
--- jEdit/trunk/org/jedit/options/TabbedOptionDialog.java 2013-09-29 20:03:32 UTC (rev 23221)
+++ jEdit/trunk/org/jedit/options/TabbedOptionDialog.java 2013-09-29 20:43:34 UTC (rev 23222)
@@ -182,10 +182,8 @@
{
GUIUtilities.saveGeometry(this, getName());
- Iterator<OptionPane> itr = panes.iterator();
- while (itr.hasNext())
+ for (OptionPane op : panes)
{
- OptionPane op = itr.next();
if (shownPanes.contains(op))
op.save();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|