Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [1237] trunk
|
From: <chr...@us...> - 2006-12-23 21:56:49
|
Revision: 1237
http://svn.sourceforge.net/gridarta/?rev=1237&view=rev
Author: christianhujer
Date: 2006-12-23 13:56:49 -0800 (Sat, 23 Dec 2006)
Log Message:
-----------
Fixed some documentation issues:
Renamed parameter names to match overridden parameter names.
Added missing @author tags.
Fixed some javadoc links.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CFTreasureListTree.java
trunk/crossfire/src/cfeditor/CFancyButton.java
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/CMainView.java
trunk/crossfire/src/cfeditor/CMapArchPanel.java
trunk/crossfire/src/cfeditor/CMapViewBasic.java
trunk/crossfire/src/cfeditor/CScriptView.java
trunk/crossfire/src/cfeditor/CStartupScreen.java
trunk/crossfire/src/cfeditor/MapViewIFrame.java
trunk/crossfire/src/cfeditor/ReplaceDialog.java
trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java
trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListView.java
trunk/daimonin/src/daieditor/CFTreasureListTree.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/CMainView.java
trunk/daimonin/src/daieditor/CMapArchPanel.java
trunk/daimonin/src/daieditor/MapViewIFrame.java
trunk/daimonin/src/daieditor/ReplaceDialog.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java
trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java
trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java
trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java
trunk/src/app/net/sf/gridarta/gui/HideFileFilterProxy.java
trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelection.java
trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java
Modified: trunk/crossfire/src/cfeditor/CFTreasureListTree.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CFTreasureListTree.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -602,7 +602,7 @@
// left right side buttons
final JButton helpButton = new JButton("Help");
helpButton.addActionListener(new ActionListener() {
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
new Help(CMainControl.getInstance().getMainView(), "treasurelists.html").setVisible(true);
}
});
Modified: trunk/crossfire/src/cfeditor/CFancyButton.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFancyButton.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CFancyButton.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -88,8 +88,8 @@
setIcon(normalIcon);
}
- @Override public void setEnabled(final boolean fEnabled) {
- super.setEnabled(fEnabled);
+ @Override public void setEnabled(final boolean b) {
+ super.setEnabled(b);
setRolloverIcon(rolloverIcon);
setIcon(normalIcon);
}
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -1529,6 +1529,7 @@
/**
* Notify all listeners about a map to be closed.
+ * @param mapControl MapControl that's being closed.
*/
private void fireMapClosingEvent(@NotNull final MapControl mapControl) {
final Object[] listeners = listenerList.getListenerList();
Modified: trunk/crossfire/src/cfeditor/CMainView.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainView.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CMainView.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -174,7 +174,7 @@
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
addWindowListener(
new WindowAdapter() {
- @Override public void windowClosing(final WindowEvent event) {
+ @Override public void windowClosing(final WindowEvent e) {
mainControl.exit();
}
});
@@ -688,36 +688,36 @@
}
/** {@inheritDoc} */
- public void internalFrameOpened(final InternalFrameEvent event) {
+ public void internalFrameOpened(final InternalFrameEvent e) {
}
/** {@inheritDoc} */
- public void internalFrameClosing(final InternalFrameEvent event) {
- mainControl.closeView((MapViewIFrame) event.getInternalFrame());
+ public void internalFrameClosing(final InternalFrameEvent e) {
+ mainControl.closeView((MapViewIFrame) e.getInternalFrame());
}
/** {@inheritDoc} */
- public void internalFrameClosed(final InternalFrameEvent event) {
+ public void internalFrameClosed(final InternalFrameEvent e) {
}
/** {@inheritDoc} */
- public void internalFrameIconified(final InternalFrameEvent event) {
- final MapViewIFrame view = (MapViewIFrame) event.getSource();
+ public void internalFrameIconified(final InternalFrameEvent e) {
+ final MapViewIFrame view = (MapViewIFrame) e.getSource();
levelViewFocusLostNotify(view);
}
/** {@inheritDoc} */
- public void internalFrameDeiconified(final InternalFrameEvent event) {
+ public void internalFrameDeiconified(final InternalFrameEvent e) {
}
/** {@inheritDoc} */
- public void internalFrameActivated(final InternalFrameEvent event) {
- final MapViewIFrame view = (MapViewIFrame) event.getSource();
+ public void internalFrameActivated(final InternalFrameEvent e) {
+ final MapViewIFrame view = (MapViewIFrame) e.getSource();
levelViewFocusGainedNotify(view);
}
/** {@inheritDoc} */
- public void internalFrameDeactivated(final InternalFrameEvent event) {
+ public void internalFrameDeactivated(final InternalFrameEvent e) {
}
/**
@@ -946,7 +946,7 @@
putValue(SHORT_DESCRIPTION, "Selects " + lafInfo.getName());
}
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
mainControl.setLookNFeel(className);
CSettings.getInstance(IGUIConstants.APP_NAME).setProperty(CMainView.SELECTED_LNF_KEY, className);
rebuildLookAndFeelMenuEntries();
Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapArchPanel.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CMapArchPanel.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -97,11 +97,11 @@
}
/** {@inheritDoc} */
- @Override public void setSize(final Dimension size) {
- if (size.width < getParent().getSize().width) {
- size.width = getParent().getSize().width;
+ @Override public void setSize(final Dimension d) {
+ if (d.width < getParent().getSize().width) {
+ d.width = getParent().getSize().width;
}
- super.setSize(size);
+ super.setSize(d);
}
};
Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -401,14 +401,14 @@
}
/** {@inheritDoc} */
- @Override public void mouseReleased(final MouseEvent event) {
- final Point clickPoint = event.getPoint();
+ @Override public void mouseReleased(final MouseEvent e) {
+ final Point clickPoint = e.getPoint();
final Point mapLoc = renderer.getTileLocationAt(clickPoint, null);
if (!mapCursor.isOnGrid(mapLoc)) {
mapCursor.dragRelease();
- } else if (event.isShiftDown()) {
+ } else if (e.isShiftDown()) {
mapCursor.dragSelect(MapGrid.SelectionMode.FLIP);
- } else if (event.isControlDown()) {
+ } else if (e.isControlDown()) {
mapCursor.dragSelect(MapGrid.SelectionMode.SUB);
} else {
mapCursor.dragSelect(MapGrid.SelectionMode.ADD);
@@ -416,9 +416,9 @@
final int buttonNr; // Number of released mouse button
- if (event.getModifiers() == InputEvent.BUTTON1_MASK) {
+ if (e.getModifiers() == InputEvent.BUTTON1_MASK) {
buttonNr = 0; // left button
- } else if (event.getModifiers() == InputEvent.BUTTON3_MASK) {
+ } else if (e.getModifiers() == InputEvent.BUTTON3_MASK) {
buttonNr = 2; // right button
} else {
buttonNr = 1; // middle
@@ -426,28 +426,28 @@
}
/** {@inheritDoc} */
- @Override public void mouseExited(final MouseEvent event) {
+ @Override public void mouseExited(final MouseEvent e) {
// endFill();
}
/** {@inheritDoc} */
- public void mouseMoved(final MouseEvent event) {
+ public void mouseMoved(final MouseEvent e) {
// repaint(); // we should blt here with clipping...
// this paints the whole map again, but we want only the marker
}
/** {@inheritDoc} */
- public void mouseDragged(final MouseEvent event) {
+ public void mouseDragged(final MouseEvent e) {
changedFlagNotify();
- final Point dragPoint = event.getPoint(); // Mouse pointer
+ final Point dragPoint = e.getPoint(); // Mouse pointer
final Point temp = renderer.getTileLocationAt(dragPoint, null); // tile under Mouse pointer
- if ((event.getModifiers() & InputEvent.BUTTON1_MASK) != 0) {
+ if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0) {
// Left Mouse Button: Selected area gets highlighted
mapCursor.dragTo(temp);
- } else if ((event.getModifiers() & InputEvent.BUTTON3_MASK) != 0) {
+ } else if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0) {
mapCursor.setLocation(temp);
// Right Mouse Button: Arches get inserted all the way
Modified: trunk/crossfire/src/cfeditor/CScriptView.java
===================================================================
--- trunk/crossfire/src/cfeditor/CScriptView.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CScriptView.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -138,8 +138,8 @@
}
}
- public void actionPerformed(final ActionEvent ev) {
- runPlugin((String) ev.getActionCommand());
+ public void actionPerformed(final ActionEvent e) {
+ runPlugin((String) e.getActionCommand());
}
public void runPlugin(final String script) {
Modified: trunk/crossfire/src/cfeditor/CStartupScreen.java
===================================================================
--- trunk/crossfire/src/cfeditor/CStartupScreen.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/CStartupScreen.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -80,7 +80,7 @@
setBounds(bounds);
clickListener = new MouseAdapter() {
- @Override public void mouseClicked(final MouseEvent event) {
+ @Override public void mouseClicked(final MouseEvent e) {
close();
}
};
@@ -108,10 +108,10 @@
/**
* Overridden to paint the loaded startup image.
- * @param grfx The graphics context to paint to.
+ * @param g The graphics context to paint to.
*/
- @Override public void paint(final Graphics grfx) {
- image.paintIcon(this, grfx, 0, 0);
+ @Override public void paint(final Graphics g) {
+ image.paintIcon(this, g, 0, 0);
//grfx.drawImage(pinga, 0, 0, null);
}
@@ -119,11 +119,11 @@
* Overridden to startup a timer that then closes this window after
* a few seconds.
*/
- @Override public void setVisible(final boolean visible) {
- if (visible) {
+ @Override public void setVisible(final boolean b) {
+ if (b) {
super.setVisible(true);
autoCloseTimer = new Timer(3000, new ActionListener() {
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
close();
}
});
Modified: trunk/crossfire/src/cfeditor/MapViewIFrame.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapViewIFrame.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/MapViewIFrame.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -269,7 +269,7 @@
}
/** {@inheritDoc} */
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
mainControl.setCurrentLevelView(MapViewIFrame.this);
}
Modified: trunk/crossfire/src/cfeditor/ReplaceDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/ReplaceDialog.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/ReplaceDialog.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -343,9 +343,9 @@
private class ReplaceWithBoxItemListener implements ItemListener {
/** {@inheritDoc} */
- public void itemStateChanged(final ItemEvent event) {
+ public void itemStateChanged(final ItemEvent e) {
final int selectedIndex = replaceWithBox.getSelectedIndex();
- if (event.getStateChange() == ItemEvent.SELECTED && lastSelectedIndex != selectedIndex) {
+ if (e.getStateChange() == ItemEvent.SELECTED && lastSelectedIndex != selectedIndex) {
switch (selectedIndex) {
case 0:
// replace with arch
Modified: trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/gui/map/DefaultLevelRenderer.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -170,11 +170,11 @@
return bufImage;
}
- @Override public void paintComponent(final Graphics grfx) {
+ @Override public void paintComponent(final Graphics g) {
if (isPickmap) {
- paintComponent(grfx, false);
+ paintComponent(g, false);
} else {
- paintFromBackbuffer(grfx, 0, 0, bufferedSize.width, bufferedSize.height);
+ paintFromBackbuffer(g, 0, 0, bufferedSize.width, bufferedSize.height);
}
}
Modified: trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListControl.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -81,7 +81,7 @@
ActionListener getButtonDownActionListener() {
return new ActionListener() {
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
final GameObject arch = getMapTileSelection();
if (arch != null) {
arch.moveDown();
@@ -92,7 +92,7 @@
ActionListener getButtonUpActionListener() {
return new ActionListener() {
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
final GameObject arch = getMapTileSelection();
if (arch != null) {
arch.moveUp();
Modified: trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListView.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListView.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/crossfire/src/cfeditor/gui/maptilelist/MapTileListView.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -405,6 +405,8 @@
/**
* Set a map tile selection.
*
+ * @param mapTileSelection Selection that's made.
+ *
* @return <code>true</code> if the selected map tile has changed
*/
private boolean setSelectedMapTile(@Nullable final MapTileSelection<GameObject, MapControl> mapTileSelection) {
Modified: trunk/daimonin/src/daieditor/CFTreasureListTree.java
===================================================================
--- trunk/daimonin/src/daieditor/CFTreasureListTree.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/CFTreasureListTree.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -281,8 +281,8 @@
if (f.isDirectory()) {
// This is a directory -> only accept *.tl files and directories
final String[] traverse = f.list(new FilenameFilter() {
- public boolean accept(final File d, final String name) {
- final File fullPath = new File(d, name);
+ public boolean accept(final File dir, final String name) {
+ final File fullPath = new File(dir, name);
return ((fullPath.isDirectory() && !name.equalsIgnoreCase("cvs")))
|| name.toLowerCase().endsWith(".tl");
}
@@ -617,7 +617,7 @@
// left right side buttons
final JButton helpButton = new JButton("Help");
helpButton.addActionListener(new ActionListener() {
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
new Help(CMainControl.getInstance().getMainView(), "treasurelists.html").setVisible(true);
}
});
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -1724,6 +1724,7 @@
/**
* Notify all listeners about a map to be closed.
+ * @param mapControl MapControl that's being closed.
*/
private void fireMapClosingEvent(@NotNull final MapControl mapControl) {
final Object[] listeners = listenerList.getListenerList();
Modified: trunk/daimonin/src/daieditor/CMainView.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainView.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/CMainView.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -640,36 +640,36 @@
}
/** {@inheritDoc} */
- public void internalFrameOpened(final InternalFrameEvent event) {
+ public void internalFrameOpened(final InternalFrameEvent e) {
}
/** {@inheritDoc} */
- public void internalFrameClosing(final InternalFrameEvent event) {
- mainControl.closeView((MapViewIFrame) event.getInternalFrame());
+ public void internalFrameClosing(final InternalFrameEvent e) {
+ mainControl.closeView((MapViewIFrame) e.getInternalFrame());
}
/** {@inheritDoc} */
- public void internalFrameClosed(final InternalFrameEvent event) {
+ public void internalFrameClosed(final InternalFrameEvent e) {
}
/** {@inheritDoc} */
- public void internalFrameIconified(final InternalFrameEvent event) {
- final MapViewIFrame view = (MapViewIFrame) event.getSource();
+ public void internalFrameIconified(final InternalFrameEvent e) {
+ final MapViewIFrame view = (MapViewIFrame) e.getSource();
levelViewFocusLostNotify(view);
}
/** {@inheritDoc} */
- public void internalFrameDeiconified(final InternalFrameEvent event) {
+ public void internalFrameDeiconified(final InternalFrameEvent e) {
}
/** {@inheritDoc} */
- public void internalFrameActivated(final InternalFrameEvent event) {
- final MapViewIFrame view = (MapViewIFrame) event.getSource();
+ public void internalFrameActivated(final InternalFrameEvent e) {
+ final MapViewIFrame view = (MapViewIFrame) e.getSource();
levelViewFocusGainedNotify(view);
}
/** {@inheritDoc} */
- public void internalFrameDeactivated(final InternalFrameEvent event) {
+ public void internalFrameDeactivated(final InternalFrameEvent e) {
}
/**
Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -103,11 +103,11 @@
}
/** {@inheritDoc} */
- @Override public void setSize(final Dimension size) {
- if (size.width < getParent().getSize().width) {
- size.width = getParent().getSize().width;
+ @Override public void setSize(final Dimension d) {
+ if (d.width < getParent().getSize().width) {
+ d.width = getParent().getSize().width;
}
- super.setSize(size);
+ super.setSize(d);
}
};
Modified: trunk/daimonin/src/daieditor/MapViewIFrame.java
===================================================================
--- trunk/daimonin/src/daieditor/MapViewIFrame.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/MapViewIFrame.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -215,7 +215,7 @@
}
/** {@inheritDoc} */
- public void actionPerformed(final ActionEvent event) {
+ public void actionPerformed(final ActionEvent e) {
mainControl.setCurrentLevelView(MapViewIFrame.this);
}
Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/ReplaceDialog.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -352,9 +352,9 @@
private class ReplaceWithBoxItemListener implements ItemListener {
/** {@inheritDoc} */
- public void itemStateChanged(final ItemEvent event) {
+ public void itemStateChanged(final ItemEvent e) {
final int selectedIndex = replaceWithBox.getSelectedIndex();
- if (event.getStateChange() == ItemEvent.SELECTED && lastSelectedIndex != selectedIndex) {
+ if (e.getStateChange() == ItemEvent.SELECTED && lastSelectedIndex != selectedIndex) {
final int size;
switch (selectedIndex) {
case 0:
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -185,8 +185,8 @@
if (f.isDirectory()) {
// This is a directory -> only accept *.art files and directories
final String[] traverse = f.list(new FilenameFilter() {
- public boolean accept(final File d, final String name) {
- final File fullPath = new File(d, name);
+ public boolean accept(final File dir, final String name) {
+ final File fullPath = new File(dir, name);
// TODO: Replace this with a proper FileFilter.
return fullPath.isDirectory() && !name.equalsIgnoreCase("cvs") && !name.equalsIgnoreCase(".xvpics") && !name.equalsIgnoreCase(".svn")
|| name.toLowerCase().endsWith(".art");
Modified: trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -206,9 +206,9 @@
return bufImage;
}
- @Override public void paintComponent(final Graphics grfx) {
+ @Override public void paintComponent(final Graphics g) {
final long start = System.currentTimeMillis();
- paintComponent2((Graphics2D) grfx);
+ paintComponent2((Graphics2D) g);
final long lastPaint = System.currentTimeMillis() - start;
mainControl.setStatusText("Sel: " + lastSelectionPaint + " Core: " + lastCorePaint + " All: " + lastPaint);
}
Modified: trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -273,14 +273,14 @@
private class MapFileView extends FileView {
/** {@inheritDoc} */
- @Override public Icon getIcon(final File file) {
+ @Override public Icon getIcon(final File f) {
final ImageIcon icon;
- if (fileChooser.getCurrentDirectory().equals(file.getParentFile())) {
- icon = getMapIcon(file);
+ if (fileChooser.getCurrentDirectory().equals(f.getParentFile())) {
+ icon = getMapIcon(f);
} else {
icon = null;
}
- return icon != null ? icon : super.getIcon(file);
+ return icon != null ? icon : super.getIcon(f);
}
} // class MapFileView
Modified: trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -94,8 +94,8 @@
return bufImage;
}
- @Override protected void paintComponent(final Graphics grfx) {
- paintComponent2((Graphics2D) grfx);
+ @Override protected void paintComponent(final Graphics g) {
+ paintComponent2((Graphics2D) g);
}
/**
Modified: trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/daimonin/src/daieditor/gui/map/tools/ToolSelector.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -156,7 +156,7 @@
}
/** {@inheritDoc} */
- public void actionPerformed(@NotNull final ActionEvent actionEvent) {
+ public void actionPerformed(@NotNull final ActionEvent e) {
setSelectedTool(tool);
}
Modified: trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/src/app/net/sf/gridarta/gameobject/NamedTreeNode.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -229,8 +229,8 @@
}
/** {@inheritDoc} */
- public int compareTo(final NamedTreeNode<T> other) {
- return this.dir ^ !other.dir ? name.compareTo(other.name) : this.dir ? -1 : 1;
+ public int compareTo(final NamedTreeNode<T> o) {
+ return this.dir ^ !o.dir ? name.compareTo(o.name) : this.dir ? -1 : 1;
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/HideFileFilterProxy.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/HideFileFilterProxy.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/src/app/net/sf/gridarta/gui/HideFileFilterProxy.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -66,6 +66,8 @@
* {@inheritDoc}
* First checks whether the file should be hidden, if not, checks the other FileFilter.
*/
+ // XXX suppression because parameter name depends on class loader search order.
+ @SuppressWarnings({"ParameterNameDiffersFromOverriddenParameter"})
@Override public boolean accept(final File pathname) {
if (pathname.getName().startsWith(".")) {
return false;
Modified: trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelection.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelection.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelection.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -64,7 +64,7 @@
@Nullable private G gameObject = null;
/**
- * The index in the map tile list that corresponds to {@link gameObject}.
+ * The index in the map tile list that corresponds to {@link #gameObject}.
* It is set to zero if <code>gameObject</code> is <code>null</code>.
*/
private int index = 0;
Modified: trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java 2006-12-23 21:46:21 UTC (rev 1236)
+++ trunk/src/app/net/sf/gridarta/gui/maptilelist/MapTileSelectionCache.java 2006-12-23 21:56:49 UTC (rev 1237)
@@ -13,6 +13,7 @@
/**
* The class <code>MapTileSelectionCache</code> manages a cache that contains
* one {@link MapTileSelection} instance for each {@link MapControl} instance.
+ * @author unknown
*/
public class MapTileSelectionCache<G extends GameObject<G>, C extends MapControl> {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
