Author: jflesch
Date: 2007-12-01 18:41:30 +0000 (Sat, 01 Dec 2007)
New Revision: 16193
Modified:
trunk/apps/Thaw/src/com/birosoft/liquid/FileChooserBasicUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidCheckBoxUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxButton.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidDesktopIconUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidFrameBorder.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameBorder.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidLookAndFeel.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuItemUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidProgressBarUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidRootPaneUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollBarUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollButton.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollPaneUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSliderUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSpinnerUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSplitPaneDivider.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTabbedPaneUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTableHeaderUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTitlePane.java
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidToolBarUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/XTraScrollBarUI.java
trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinImageCache.java
trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinMenuItem.java
trunk/apps/Thaw/src/com/birosoft/liquid/util/Panel.java
trunk/apps/Thaw/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
trunk/apps/Thaw/src/net/infonode/gui/laf/InfoNodeLookAndFeel.java
trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java
trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java
trunk/apps/Thaw/src/thaw/gui/JDragTree.java
trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
Log:
Fix all the eclipse warnings (Look'n'feels included)
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/FileChooserBasicUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/FileChooserBasicUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/FileChooserBasicUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -37,7 +37,6 @@
import java.beans.PropertyChangeListener;
import java.io.File;
-import java.io.IOException;
import java.text.DateFormat;
@@ -97,7 +96,6 @@
public class FileChooserBasicUI extends BasicFileChooserUI {
private static final Dimension hstrut5 = new Dimension(5, 1);
- private static final Dimension hstrut11 = new Dimension(11, 1);
private static final Dimension vstrut5 = new Dimension(1, 5);
private static final Insets shrinkwrap = new Insets(2, 2, 2, 2);
@@ -144,7 +142,6 @@
}
};
- private boolean useShellFolder;
private ListSelectionModel listSelectionModel;
private JList list;
private JTable detailsTable;
@@ -361,7 +358,6 @@
// FileSystemView.getRoots() returns one folder and that is
// the same as the first item in the ShellFolder combobox list.
{
- useShellFolder = false;
}
// ************************************** //
@@ -542,17 +538,16 @@
protected void installListeners(JFileChooser fc) {
super.installListeners(fc);
- ActionMap actionMap = getActionMap();
+ ActionMap actionMap = getActionMapSub();
SwingUtilities.replaceUIActionMap(fc, actionMap);
}
- protected ActionMap getActionMap() {
- return createActionMap();
+ protected ActionMap getActionMapSub() {
+ return createActionMapSub();
}
-
- protected ActionMap createActionMap() {
+ protected ActionMap createActionMapSub() {
AbstractAction escAction = new AbstractAction() {
- /**
+ /**
*
*/
private static final long serialVersionUID =
-425601186607161693L;
@@ -965,7 +960,7 @@
editCell = new JTextField();
editCell.addActionListener(new EditActionListener());
editCell.addFocusListener(editorFocusListener);
- editCell.setNextFocusableComponent(list);
+ //editCell.setNextFocusableComponent(list);
}
list.add(editCell);
@@ -1917,23 +1912,12 @@
File[] baseFolders;
- baseFolders = fsv.getRoots();
+ baseFolders = fsv.getRoots();
directories.addAll(Arrays.asList(baseFolders));
- // Get the canonical (full) path. This has the side
- // benefit of removing extraneous chars from the path,
- // for example /foo/bar/ becomes /foo/bar
- File canonical = null;
- try {
- canonical = directory.getCanonicalFile();
- } catch (IOException e) {
- // Maybe drive is not ready. Can't abort here.
- canonical = directory;
- }
-
- calculateDepths();
+ calculateDepths();
}
private void calculateDepths() {
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidCheckBoxUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidCheckBoxUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidCheckBoxUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -94,9 +94,6 @@
textRect.x = textRect.y = textRect.width = textRect.height = 0;
Icon altIcon = b.getIcon();
- Icon selectedIcon = null;
- Icon disabledIcon = null;
-
String text = SwingUtilities.layoutCompoundLabel(c, fm, b.getText(),
(altIcon != null) ? altIcon : getDefaultIcon(),
b.getVerticalAlignment(), b.getHorizontalAlignment(),
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxButton.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxButton.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxButton.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -153,7 +153,6 @@
Insets insets = new Insets(0, 12, 2, 2);
int width = getWidth() - (insets.left + insets.right);
- int widthFocus = width; //- (skin.getHsize()-skin.getOffset());
int height = getHeight() - (insets.top + insets.bottom);
if (height <= 0 || width <= 0)
@@ -163,12 +162,7 @@
int left = insets.left;
int top = insets.top;
- int right = left + (width - 1);
- int bottom = top + (height - 1);
-
int iconWidth = LiquidComboBoxUI.comboBoxButtonSize;
- int iconLeft = (leftToRight) ? right : left;
-
// Let the renderer paint
Component c = null;
boolean mustResetOpaque = false;
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidComboBoxUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -308,10 +308,6 @@
Insets margin = arrowButton.getMargin();
Insets insets = comboBox.getInsets();
- if (editor instanceof JComponent) {
- Insets editorInsets = ((JComponent) editor).getInsets();
- }
-
size.height += (margin.top + margin.bottom);
size.height += (insets.top + insets.bottom);
@@ -368,14 +364,10 @@
}
public Dimension preferredLayoutSize(Container parent) {
- JComboBox cb = (JComboBox) parent;
-
return parent.getPreferredSize();
}
public Dimension minimumLayoutSize(Container parent) {
- JComboBox cb = (JComboBox) parent;
-
return parent.getMinimumSize();
}
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidDesktopIconUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidDesktopIconUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidDesktopIconUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -241,11 +241,7 @@
public void mouseDragged(MouseEvent e) {
Point p;
- int newX, newY, newW, newH;
- int deltaX;
- int deltaY;
- Dimension min;
- Dimension max;
+ int newX, newY;
p = SwingUtilities.convertPoint((Component)e.getSource(),
e.getX(), e.getY(), null);
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidFrameBorder.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidFrameBorder.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidFrameBorder.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -30,11 +30,8 @@
private static LiquidFrameBorder onlyInstance;
// private static Robot robot;
// private static boolean robotsSupported = true;
- private static final Insets insets = new Insets(0, 4, 4, 4);
private boolean prevState = false;
private Window window;
- private int titleHeight;
-
/** indicates whether the internal frame is active */
private boolean isActive = true;
@@ -92,8 +89,6 @@
int frameTitleHeight = UIManager.getInt(
"InternalFrame.frameTitleHeight");
- int index = isActive ? 0 : 1;
-
drawLeftTop(g, isActive, 4, frameTitleHeight);
g.translate(0, frameTitleHeight);
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameBorder.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameBorder.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameBorder.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -51,8 +51,6 @@
{
int frameTitleHeight = isPalette ?
UIManager.getInt("InternalFrame.paletteTitleHeight") :
UIManager.getInt("InternalFrame.frameTitleHeight");
- int index=isActive ? 0 : 1;
-
drawLeftTop(g, isActive, 4, frameTitleHeight);
g.translate(0, frameTitleHeight);
Modified:
trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -76,12 +76,6 @@
protected int frameTitleHeight;
/**
- * The buttons width, calculated at runtime.
- */
- private int buttonsWidth;
-
-
- /**
* This constructor creates a title pane for the given internal frame
* instance.
*
@@ -143,8 +137,6 @@
int width = getWidth();
int height = getHeight();
- Color foreground =
LiquidLookAndFeel.getWindowTitleInactiveForeground();
-
Graphics2D g2 = (Graphics2D) g;
Object oldAntiAliasingValue =
g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
@@ -647,8 +639,6 @@
}
}
}
-
- buttonsWidth = leftToRight ? (w - x) : x;
}
public void activate() {
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidInternalFrameUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -34,7 +34,6 @@
public class LiquidInternalFrameUI extends BasicInternalFrameUI {
protected static String IS_PALETTE = "JInternalFrame.isPalette";
private static String FRAME_TYPE = "JInternalFrame.frameType";
- private static String NORMAL_FRAME = "normal";
private static String PALETTE_FRAME = "palette";
private static String OPTION_DIALOG = "optionDialog";
private static final PropertyChangeListener liquidPropertyChangeListener =
new LiquidPropertyChangeHandler();
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidLookAndFeel.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidLookAndFeel.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidLookAndFeel.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -264,16 +264,11 @@
"reset-field-edit", "UP", "increment", "KP_UP", "increment",
"DOWN", "decrement", "KP_DOWN", "decrement",
});
- private boolean windowslfforfilechooser = false;
-
-
/**
* This constructor installs the Liquid Look and Feel with the default
color
* theme.
*/
public LiquidLookAndFeel() {
- windowslfforfilechooser = false;
-
if (!isInstalled) {
isInstalled = true;
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuItemUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuItemUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuItemUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -76,9 +76,6 @@
protected static int defaultTextIconGap;
protected static int defaultIconGap;
- /* diagnostic aids -- should be false for production builds. */
- private static final boolean TRACE = false; // trace creates and disposes
- private static final boolean VERBOSE = false; // show reuse hits/misses
private static final boolean DEBUG = false; // show bad params, misc.
/* Client Property keys for text and accelerator text widths */
@@ -492,27 +489,6 @@
menuItem.doClick(0);
}
- /**
- * This is to see if the menu item in question is part of the
- * system menu on an internal frame.
- * The Strings that are being checked can be found in
- * MetalInternalFrameTitlePaneUI.java,
- * WindowsInternalFrameTitlePaneUI.java, and
- * MotifInternalFrameTitlePaneUI.java.
- *
- * @since 1.4
- */
- private boolean isInternalFrameSystemMenu() {
- String actionCommand = menuItem.getActionCommand();
-
- if ((actionCommand == "Close") || (actionCommand == "Minimize") ||
- (actionCommand == "Restore") || (actionCommand == "Maximize"))
{
- return true;
- } else {
- return false;
- }
- }
-
public static ComponentUI createUI(JComponent c) {
return new LiquidMenuItemUI();
}
@@ -734,8 +710,6 @@
JMenuItem b = (JMenuItem) c;
ButtonModel model = b.getModel();
- Icon bicon = b.getIcon();
-
JComponent p = (JComponent) b.getParent();
Integer maxValueInt = (Integer)
p.getClientProperty(LiquidMenuItemUI.MAX_ICON_WIDTH);
int maxValue = (maxValueInt == null) ? 16 : maxValueInt.intValue();
@@ -787,7 +761,6 @@
// layout the text and icon
Icon ic = b.getIcon();
- Icon iCheck = checkIcon;
Icon paintIcon = ic;
if (useCheckAndArrow()) {
@@ -1227,7 +1200,6 @@
public void menuDragMouseReleased(MenuDragMouseEvent e) {
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement[] path = e.getPath();
Point p = e.getPoint();
if ((p.x >= 0) && (p.x < menuItem.getWidth()) && (p.y >= 0) &&
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuUI.java 2007-12-01
17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidMenuUI.java 2007-12-01
18:41:30 UTC (rev 16193)
@@ -22,7 +22,6 @@
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.ActionMap;
-import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
@@ -65,12 +64,6 @@
private int lastMnemonic = 0;
- /** Uses as the parent of the windowInputMap when selected. */
- private InputMap selectedWindowInputMap;
-
- /* diagnostic aids -- should be false for production builds. */
- private static final boolean TRACE = false; // trace creates and disposes
- private static final boolean VERBOSE = false; // show reuse hits/misses
private static final boolean DEBUG = false; // show bad params, misc.
private static boolean crossMenuMnemonic = true;
@@ -83,7 +76,6 @@
public void installUI(JComponent c)
{
super.installUI(c);
- JMenu m=(JMenu)c;
}
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidProgressBarUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidProgressBarUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidProgressBarUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -135,8 +135,6 @@
if (!(g instanceof Graphics2D)) {
return;
}
- Graphics2D g2 = (Graphics2D) g;
-
int index = 0;//progressBar.isEnabled() ? 0 : 1;
Insets b = progressBar.getInsets(); // area for border
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidRootPaneUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidRootPaneUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidRootPaneUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -458,7 +458,6 @@
int mbWidth = 0;
int mbHeight = 0;
int tpWidth = 0;
- int tpHeight = 0;
Insets i = parent.getInsets();
JRootPane root = (JRootPane) parent;
@@ -491,7 +490,6 @@
if (tpd != null) {
tpWidth = tpd.width;
- tpHeight = tpd.height;
}
}
}
@@ -516,7 +514,6 @@
int mbWidth = 0;
int mbHeight = 0;
int tpWidth = 0;
- int tpHeight = 0;
Insets i = parent.getInsets();
JRootPane root = (JRootPane) parent;
@@ -549,7 +546,6 @@
if (tpd != null) {
tpWidth = tpd.width;
- tpHeight = tpd.height;
}
}
}
@@ -674,7 +670,6 @@
}
if (root.getContentPane() != null) {
- Dimension cpd = root.getContentPane().getPreferredSize();
root.getContentPane().setBounds(0, nextY, w,
(h < nextY) ? 0 : (h - nextY));
}
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollBarUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollBarUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollBarUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -10,7 +10,6 @@
package com.birosoft.liquid;
-import java.awt.Color;
import java.awt.Insets;
import java.awt.Dimension;
import java.awt.Graphics;
@@ -33,30 +32,9 @@
public class LiquidScrollBarUI extends BasicScrollBarUI
{
private int orientation = -1;
- private int minExtent, minValue;
private final int MIN_THUMB_SIZE = 14;
public static final String FREE_STANDING_PROP =
"JScrollBar.isFreeStanding";
- /**
- * The scrollbar's highlight color.
- */
- private static Color highlightColor;
-
- /**
- * The scrollbar's dark shadow color.
- */
- private static Color darkShadowColor;
-
- /**
- * The thumb's shadow color.
- */
- private static Color thumbShadow;
-
- /**
- * The thumb's highlight color.
- */
- private static Color thumbHighlightColor;
-
/** true if thumb is in rollover state */
protected boolean isRollover=false;
/** true if thumb was in rollover state */
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollButton.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollButton.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollButton.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -30,8 +30,6 @@
*/
private static final long serialVersionUID = -7314095928302353987L;
private boolean isFreeStanding = false;
- private int buttonWidth;
-
/** one of the four skins for the button */
private static Skin skinUp= new Skin("scrollbuttonsup.png", 4, 0);
/** one of the four skins for the button */
@@ -53,7 +51,6 @@
public LiquidScrollButton(int orientation,int width, boolean freeStanding)
{
super(orientation);
- buttonWidth = width;
isFreeStanding = freeStanding;
this.putClientProperty(LiquidScrollBarUI.FREE_STANDING_PROP,
isFreeStanding ? Boolean.TRUE : Boolean.FALSE);
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollPaneUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollPaneUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidScrollPaneUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -110,7 +110,7 @@
if (scrollpane.isWheelScrollingEnabled() &&
(e.getScrollAmount() != 0)) {
JScrollBar toScroll = scrollpane.getVerticalScrollBar();
- int direction = 0;
+
int length = toScroll.getHeight();
// find which scrollbar to scroll, or return if none
@@ -125,8 +125,6 @@
length = toScroll.getWidth();
}
- direction = (e.getWheelRotation() < 0) ? (-1) : 1;
-
if (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) {
int newValue = toScroll.getValue() +
((e.getWheelRotation() * length) /
(toScroll.getUnitIncrement() * 2));
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSliderUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSliderUI.java 2007-12-01
17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSliderUI.java 2007-12-01
18:41:30 UTC (rev 16193)
@@ -104,14 +104,6 @@
public void paintTicks(Graphics g) {
Rectangle tickBounds = tickRect;
- int i;
- int maj;
- int min;
- int max;
- int w = tickBounds.width;
- int h = tickBounds.height;
- int centerEffect;
- int tickHeight;
boolean leftToRight = slider.getComponentOrientation().isLeftToRight();
g.setColor(new Color(0, 0, 0, 0));
@@ -119,9 +111,6 @@
tickBounds.height);
g.setColor(Color.black);
- maj = slider.getMajorTickSpacing();
- min = slider.getMinorTickSpacing();
-
if (slider.getOrientation() == JSlider.HORIZONTAL) {
g.translate(0, tickBounds.y);
@@ -195,8 +184,6 @@
}
public void paintTrack(Graphics g) {
- Color trackColor = Color.red;
-
boolean leftToRight = slider.getComponentOrientation().isLeftToRight();
g.translate(trackRect.x, trackRect.y);
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSpinnerUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSpinnerUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSpinnerUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -56,7 +56,6 @@
true);
private static final ArrowButtonHandler previousButtonHandler = new
ArrowButtonHandler("decrement",
false);
- private static final Dimension zeroSize = new Dimension(0, 0);
public static ComponentUI createUI(JComponent c) {
return new LiquidSpinnerUI();
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSplitPaneDivider.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSplitPaneDivider.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidSplitPaneDivider.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -51,9 +51,7 @@
*/
private static final long serialVersionUID = 4058298927908826880L;
- private int inset = 0;
-
- Skin skinVertSplitter = null;
+ Skin skinVertSplitter = null;
Skin skinHorzSplitter = null;
public LiquidSplitPaneDivider(BasicSplitPaneUI ui)
@@ -80,7 +78,6 @@
{
Dimension size = getSize();
Rectangle clip = new Rectangle(size.width, size.height);
- Insets insets = getInsets();
if (orientation == JSplitPane.HORIZONTAL_SPLIT)
{
int xOffset = (clip.width - 5) / 2;
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTabbedPaneUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTabbedPaneUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTabbedPaneUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -537,17 +537,8 @@
}
public void paint(Graphics g, JComponent c) {
- int width = tabPane.getWidth();
- int height = tabPane.getHeight();
- Insets insets = tabPane.getInsets();
- int x = insets.left;
- int y = insets.top;
- int w = width - insets.right - insets.left;
- int h = height - insets.top - insets.bottom;
-
int tabPlacement = tabPane.getTabPlacement();
- Insets contentInsets = getContentBorderInsets(tabPlacement);
if (tabPlacement == BOTTOM) {
Color oldColor = g.getColor();
@@ -578,7 +569,6 @@
protected int getTabLabelShiftX(int tabPlacement, int tabIndex,
boolean isSelected) {
- Rectangle tabRect = rects[tabIndex];
int nudge = 0;
switch (tabPlacement) {
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTableHeaderUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTableHeaderUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTableHeaderUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -273,7 +273,6 @@
}
private Dimension createHeaderSize(long width) {
- TableColumnModel columnModel = header.getColumnModel();
// None of the callers include the intercell spacing, do it here.
if (width > Integer.MAX_VALUE) {
@@ -433,7 +432,6 @@
}
Point p = e.getPoint();
- TableColumnModel columnModel = header.getColumnModel();
int index = header.columnAtPoint(p);
if (index != columnSelected) {
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTitlePane.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTitlePane.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidTitlePane.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -17,10 +17,7 @@
import java.beans.*;
-import java.util.Locale;
-
import javax.swing.*;
-import javax.swing.border.*;
import javax.swing.plaf.*;
@@ -53,7 +50,6 @@
*
*/
private static final long serialVersionUID = -1424746354108457746L;
- private static final Border handyEmptyBorder = new EmptyBorder(0, 0, 0,
0);
private static final int IMAGE_HEIGHT = 16;
private static final int IMAGE_WIDTH = 16;
private static LiquidWindowButtonUI iconButtonUI;
@@ -143,25 +139,13 @@
private JRootPane rootPane;
/**
- * Room remaining in title for bumps.
- */
- private int buttonsWidth;
-
- /**
* Buffered Frame.state property. As state isn't bound, this is kept
* to determine when to avoid updating widgets.
*/
private int state;
- /**
- * RootPaneUI that created us.
- */
- private LiquidRootPaneUI rootPaneUI;
-
public LiquidTitlePane(JRootPane root, LiquidRootPaneUI ui) {
rootPane = root;
- rootPaneUI = ui;
-
state = -1;
installSubcomponents();
@@ -171,15 +155,6 @@
}
/**
- * Uninstalls the necessary state.
- */
- private void uninstall() {
- uninstallListeners();
- window = null;
- removeAll();
- }
-
- /**
* Installs the necessary listeners.
*/
private void installListeners() {
@@ -324,12 +299,6 @@
}
/**
- * Uninstalls any previously installed UI values.
- */
- private void uninstallDefaults() {
- }
-
- /**
* Returns the <code>JMenuBar</code> displaying the appropriate
* system menu items.
*/
@@ -463,7 +432,6 @@
* Adds the necessary <code>JMenuItem</code>s to the passed in menu.
*/
private void addMenuItems(JPopupMenu menu) {
- Locale locale = getRootPane().getLocale();
JMenuItem mi = menu.add(restoreAction);
mi.setMnemonic('r');
@@ -728,7 +696,6 @@
int width = getWidth();
int height = getHeight();
- Color foreground =
LiquidLookAndFeel.getWindowTitleInactiveForeground();
Graphics2D g2 = (Graphics2D) g;
Object oldAntiAliasingValue =
g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
@@ -1008,53 +975,6 @@
}
/**
- * Convenience method to clip the passed in text to the specified
- * size.
- */
- private String clippedText(String text, FontMetrics fm, int
availTextWidth) {
- if ((text == null) || (text.equals(""))) {
- return "";
- }
-
- int textWidth = SwingUtilities.computeStringWidth(fm, text);
- String clipString = "...";
-
- if (textWidth > availTextWidth) {
- int totalWidth = SwingUtilities.computeStringWidth(fm, clipString);
- int nChars;
-
- for (nChars = 0; nChars < text.length(); nChars++) {
- totalWidth += fm.charWidth(text.charAt(nChars));
-
- if (totalWidth > availTextWidth) {
- break;
- }
- }
-
- text = text.substring(0, nChars) + clipString;
- }
-
- return text;
- }
-
- private int getInt(Object key, int defaultValue) {
- Object value = UIManager.get(key);
-
- if (value instanceof Integer) {
- return ((Integer) value).intValue();
- }
-
- if (value instanceof String) {
- try {
- return Integer.parseInt((String) value);
- } catch (NumberFormatException nfe) {
- }
- }
-
- return defaultValue;
- }
-
- /**
* Actions used to <code>close</code> the <code>Window</code>.
*/
private class CloseAction extends AbstractAction {
@@ -1268,8 +1188,6 @@
public void layoutContainer(Container c) {
if (getWindowDecorationStyle() == JRootPane.NONE) {
- buttonsWidth = 0;
-
return;
}
@@ -1368,8 +1286,6 @@
}
}
}
-
- buttonsWidth = leftToRight ? (w - x) : x;
}
}
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/LiquidToolBarUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/LiquidToolBarUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/LiquidToolBarUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -42,11 +42,6 @@
private Skin hbarHandler = new Skin("htoolbarhandler.png", 1, 3, 8, 3, 8);
/**
- * These insets are forced inner margin for the toolbar buttons.
- */
- private Insets insets = new Insets(2, 2, 2, 2);
-
- /**
* Creates the UI delegate for the given component.
*
* @param c The component to create its UI delegate.
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/XTraScrollBarUI.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/XTraScrollBarUI.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/XTraScrollBarUI.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -268,7 +268,6 @@
BoundedRangeModel model =
XTraScrollBarUI.this.scrollbar().getModel();
Rectangle thumbR = XTraScrollBarUI.this.getThumbBounds();
- float trackLength;
int thumbMin, thumbMax, thumbPos;
if (XTraScrollBarUI.this.scrollbar().getOrientation() ==
JScrollBar.VERTICAL) {
@@ -276,14 +275,12 @@
thumbMax = XTraScrollBarUI.this.decrButton().getY()
/*incrButton.getY()*/ - XTraScrollBarUI.this.getThumbBounds().height;
thumbPos = Math.min(thumbMax, Math.max(thumbMin, (e.getY() -
offset)));
XTraScrollBarUI.this.setThumbBounds(thumbR.x, thumbPos,
thumbR.width, thumbR.height);
- trackLength = XTraScrollBarUI.this.getTrackBounds().height;
}
else {
thumbMin = sbInsets.left; //decrButton.getX() +
decrButton.getWidth();
thumbMax = XTraScrollBarUI.this.decrButton().getX()
/*incrButton.getX()*/ - XTraScrollBarUI.this.getThumbBounds().width;
thumbPos = Math.min(thumbMax, Math.max(thumbMin, (e.getX() -
offset)));
XTraScrollBarUI.this.setThumbBounds(thumbPos, thumbR.y,
thumbR.width, thumbR.height);
- trackLength = XTraScrollBarUI.this.getTrackBounds().width;
}
/* Set the scrollbars value. If the thumb has reached the end of
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinImageCache.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinImageCache.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinImageCache.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -42,12 +42,10 @@
}
private HashMap map;
- private HashMap iconMap;
private HashMap bufferedMap;
protected SkinImageCache() {
map = new HashMap();
- iconMap = new HashMap();
bufferedMap = new HashMap();
}
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinMenuItem.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinMenuItem.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/skin/SkinMenuItem.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -23,8 +23,6 @@
private int hsize, vsize;
private int roundedSize;
- private boolean useDefaultButton = false;
- private boolean useSelectedButton = false;
private boolean doneAllCalculations = false;
public SkinMenuItem(String fileName, int leftOffset, int
leftRolloverOffset, int rightOffset, int rightRolloverOffset, int roundedSize)
Modified: trunk/apps/Thaw/src/com/birosoft/liquid/util/Panel.java
===================================================================
--- trunk/apps/Thaw/src/com/birosoft/liquid/util/Panel.java 2007-12-01
17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/com/birosoft/liquid/util/Panel.java 2007-12-01
18:41:30 UTC (rev 16193)
@@ -7,8 +7,6 @@
package com.birosoft.liquid.util;
import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.awt.geom.Rectangle2D;
/**
*
@@ -35,76 +33,4 @@
//drawIt(g, 10, 10, 48, 48, bg, bg);
}
- private void drawIt(Graphics g, int x, int y, int w, int h, Color c, Color
bg) {
- //g.setColor(Color.white);
- //g.fillRect(0, 0, this.getWidth(), this.getHeight());
- int x2 = x+w-1;
- int y2 = y+h-1;
- // outer dark rect
- g.setColor(Colors.dark(c, 115));
- g.drawLine(x+2, y, x2-2, y); // t
- g.drawLine(x, y+2, x, y2-2); // l
- g.drawLine(x+1, y+1, x+1, y+1); // tl
- g.setColor(Colors.dark(c, 150));
- g.drawLine(x+2, y2, x2-2, y2); // b
- g.drawLine(x2, y+2, x2, y2-2); // r
- g.drawLine(x2-1, y2-1, x2-1, y2-1); // br
- g.setColor(Colors.dark(c, 132));
- g.drawLine(x2-1, y+1, x2-1, y+1); // tr
- g.drawLine(x+1, y2-1, x+1, y2-1); // bl
-
- // inner top light lines
- g.setColor(Colors.light(c, 105));
- g.drawLine(x+2, y+1, x2-2, y+1);
- g.drawLine(x+1, y+2, x2-1, y+2);
- g.drawLine(x+1, y+3, x+2, y+3);
- g.drawLine(x2-2, y+3, x2-1, y+3);
- g.drawLine(x+1, y+4, x+1, y+4);
- g.drawLine(x2-1, y+4, x2-1, y+4);
-
- // inner bottom light lines
- g.setColor(Colors.light(c, 110));
- g.drawLine(x+2, y2-1, x2-2, y2-1);
- g.drawLine(x+1, y2-2, x2-1, y2-2);
- g.drawLine(x+1, y2-3, x+2, y2-3);
- g.drawLine(x2-2, y2-3, x2-1, y2-3);
- g.drawLine(x+1, y2-4, x+1, y2-4);
- g.drawLine(x2-1, y2-4, x2-1, y2-4);
-
- // inner left mid lines
- g.setColor(c);
- g.drawLine(x+1, y+5, x+1, y2-5);
- g.drawLine(x+2, y+4, x+2, y2-4);
-
- // inner right mid lines
- g.drawLine(x2-1, y+5, x2-1, y2-5);
- g.drawLine(x2-2, y+4, x2-2, y2-4);
-
- Graphics2D g2 = (Graphics2D)g;
- BufferedImage img = Colors.getClearFill();
- TexturePaint tp = new TexturePaint(img, new
Rectangle2D.Float(0.0f,0.0f,img.getWidth(),img.getHeight()));
- Paint p=g2.getPaint();
- g2.setPaint(tp);
- g2.fillRect(x+2, y+2, w-4, h-4);
- g2.setPaint(p);
- int red, green, blue;
- Color btnColor = Colors.dark(c, 130);
- red = (btnColor.getRed() >> 1) + (bg.getRed() >> 1);
- green = (btnColor.getGreen() >> 1) + (bg.getGreen() >> 1);
- blue = (btnColor.getBlue() >> 1) + (bg.getBlue() >> 1);
- btnColor = new Color(red, green, blue);
-
- g.setColor(btnColor);
- g.drawLine(x+1, y, x+1, y);
- g.drawLine(x, y+1, x, y+1);
- g.drawLine(x+1, y2, x+1, y2);
- g.drawLine(x, y2-1, x, y2-1);
-
- g.drawLine(x2-1, y, x2-1, y);
- g.drawLine(x2, y+1, x2, y+1);
- g.drawLine(x2-1, y2, x2-1, y2);
- g.drawLine(x2, y2-1, x2, y2-1);
-
- }
-
}
Modified: trunk/apps/Thaw/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
===================================================================
--- trunk/apps/Thaw/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -293,17 +293,6 @@
//
...........................................................................
/**
- * Convenience method to expand a user-supplied key material into a
- * session key, assuming Rijndael's default block size (128-bit).
- *
- * @param k The 128/192/256-bit user-key to use.
- * @exception InvalidKeyException If the key is invalid.
- */
- private static final Object makeKey (byte[] k) throws
InvalidKeyException {
- return makeKey(k, BLOCK_SIZE);
- }
-
- /**
* Convenience method to encrypt exactly one block of plaintext,
assuming
* Rijndael's default block size (128-bit).
*
Modified: trunk/apps/Thaw/src/net/infonode/gui/laf/InfoNodeLookAndFeel.java
===================================================================
--- trunk/apps/Thaw/src/net/infonode/gui/laf/InfoNodeLookAndFeel.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/net/infonode/gui/laf/InfoNodeLookAndFeel.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -306,41 +306,31 @@
}
}
- private static class MyListCellRenderer extends DefaultListCellRenderer {
- /**
- *
- */
- private static final long serialVersionUID = -4686589215440055032L;
- private Border normalBorder;
- private Border focusBorder;
+ public static class MyListCellRendererUIResource extends
DefaultListCellRenderer implements javax.swing.plaf.UIResource {
+ private static final long serialVersionUID =
5326463933712427348L;
+
+ private Border normalBorder;
+ private Border focusBorder;
- MyListCellRenderer(Border normalBorder, Border focusBorder) {
- this.normalBorder = normalBorder;
- this.focusBorder = focusBorder;
- }
- public Component getListCellRendererComponent(JList list, Object value,
int index,
- boolean isSelected,
- boolean cellHasFocus) {
- JLabel label = (JLabel) super.getListCellRendererComponent(list, value,
index, isSelected, cellHasFocus);
- label.setBorder(cellHasFocus ? focusBorder : normalBorder);
- return label;
- }
+ public MyListCellRendererUIResource(Border normalBorder, Border
focusBorder) {
+ this.normalBorder = normalBorder;
+ this.focusBorder = focusBorder;
+ }
- public static class UIResource extends MyListCellRenderer implements
javax.swing.plaf.UIResource {
- /**
- *
- */
- private static final long serialVersionUID =
5326463933712427348L;
+ public Component getListCellRendererComponent(JList list, Object
value, int index,
+
boolean isSelected,
+
boolean cellHasFocus) {
+ JLabel label = (JLabel)
super.getListCellRendererComponent(list, value, index, isSelected,
cellHasFocus);
+ label.setBorder(cellHasFocus ? focusBorder : normalBorder);
+ return label;
+ }
- public UIResource(Border normalBorder, Border focusBorder) {
- super(normalBorder, focusBorder);
- }
+
}
- }
- protected void initComponentDefaults(UIDefaults table) {
- super.initComponentDefaults(table);
+ protected void initComponentDefaults(UIDefaults table) {
+ super.initComponentDefaults(table);
Class iconClass = MetalLookAndFeel.class;
UIResource menuItemBorder = new MetalBorders.MenuItemBorder() {
@@ -371,7 +361,7 @@
"List.cellRenderer", new UIDefaults.ActiveValue() {
public Object createValue(UIDefaults table) {
- return new MyListCellRenderer.UIResource(theme.getListItemBorder(),
theme.getListFocusedItemBorder());
+ return new MyListCellRendererUIResource(theme.getListItemBorder(),
theme.getListFocusedItemBorder());
}
},
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java 2007-12-01 17:29:52 UTC
(rev 16192)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPGetNode.java 2007-12-01 18:41:30 UTC
(rev 16193)
@@ -33,9 +33,6 @@
public final static String usedMemElement = "volatile.usedJavaMemory";
private long usedMem = 0;
- public final static String netSizeSessionElement =
"volatile.networkSizeEstimateSession";
- private int netSizeSession = 0;
-
public final static String nmbThreadsElement =
"volatile.runningThreadCount";
private int nmbThreads = 0;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java 2007-12-01 17:29:52 UTC
(rev 16192)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPListPeers.java 2007-12-01 18:41:30 UTC
(rev 16193)
@@ -11,8 +11,6 @@
private boolean withMetadata;
private boolean withVolatile;
- private FCPQueueManager queueManager;
-
private Hashtable peers; /* key : peer name -> hashtable : key :
parameter name -> parameter value */
private boolean endList;
Modified: trunk/apps/Thaw/src/thaw/gui/JDragTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/JDragTree.java 2007-12-01 17:29:52 UTC (rev
16192)
+++ trunk/apps/Thaw/src/thaw/gui/JDragTree.java 2007-12-01 18:41:30 UTC (rev
16193)
@@ -400,7 +400,6 @@
private DragSource dragSource = null;
private DragGestureRecognizer dgRecognizer = null;
- private DropTarget dropTarget = null;
/**
* @param root
@@ -426,7 +425,7 @@
this);
// don't act on right mouse button
dgRecognizer.setSourceActions(dgRecognizer.getSourceActions() &
~InputEvent.BUTTON3_MASK & ~InputEvent.BUTTON2_MASK);
- dropTarget = new DropTarget(this, new CDropTargetListener());
+ new DropTarget(this, new CDropTargetListener());
}
/**
Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2007-12-01 17:29:52 UTC
(rev 16192)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2007-12-01 18:41:30 UTC
(rev 16193)
@@ -19,7 +19,6 @@
import thaw.core.MainWindow;
import thaw.fcp.FCPTransferQuery;
import thaw.plugins.queueWatcher.DetailPanel;
-import thaw.plugins.queueWatcher.DragAndDropManager;
import thaw.plugins.queueWatcher.QueuePanel;
public class QueueWatcher extends ToolbarModifier implements thaw.core.Plugin,
PropertyChangeListener, ChangeListener, ActionListener {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java 2007-12-01
17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexParser.java 2007-12-01
18:41:30 UTC (rev 16193)
@@ -337,7 +337,6 @@
private boolean ownerTag = false;
private boolean privateKeyTag = false;
private boolean dateTag = false;
- private boolean commentsTag = false;
private boolean categoryTag = false;
private boolean hasCommentTag = false;
private boolean clientTag = false;
@@ -400,7 +399,6 @@
if (pub != null) {
hasCommentTag = true;
- commentsTag = true;
Logger.debug(this, "Comment allowed in
this index");
index.setCommentKeys(pub, priv);
}
@@ -464,7 +462,6 @@
if (categoryStr != null)
index.setCategory(categoryStr);
} else if ("comments".equals(rawName)) {
- commentsTag = false;
return;
} else if ("client".equals(rawName)) {
clientTag = false;
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKMessage.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -41,7 +41,6 @@
private String inReplyToStr;
private String subject;
private KSKAuthor author;
- private int sigId;
private java.util.Date date;
private int rev;
private boolean read;
@@ -200,7 +199,6 @@
this.author = new KSKAuthor(nick, identity);
- this.sigId = sigId;
this.date = date;
this.rev = rev;
this.read = read;
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
2007-12-01 17:29:52 UTC (rev 16192)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DragAndDropManager.java
2007-12-01 18:41:30 UTC (rev 16193)
@@ -16,25 +16,25 @@
import java.util.Iterator;
import java.util.Vector;
-import javax.swing.JComponent;
-import javax.swing.TransferHandler;
-
import thaw.core.Core;
import thaw.core.Logger;
import thaw.fcp.FCPTransferQuery;
-
+/**
+ * TODO : WIP !
+ * @author jflesch
+ */
public class DragAndDropManager implements DragGestureListener,
DragSourceListener {
private QueuePanel[] queuePanels;
- private DragSource dragSource;
+ // private DragSource dragSource;
private final String tmpDir = System.getProperty("java.io.tmpdir");
public DragAndDropManager(final Core core, final QueuePanel[]
queuePanels) {
this.queuePanels = queuePanels;
- dragSource = DragSource.getDefaultDragSource();
+ //dragSource = DragSource.getDefaultDragSource();
//for(int i = 0 ; i < queuePanels.length ; i++) {
//dragSource.createDefaultDragGestureRecognizer(queuePanels[i].getTable(),
@@ -48,7 +48,7 @@
//}
}
- private class FileTransferHandler extends TransferHandler {
+ /*private class FileTransferHandler extends TransferHandler {
private static final long serialVersionUID = 1L;
protected Transferable createTransferable(final JComponent c) {
@@ -65,7 +65,7 @@
return null;
}
- }
+ }*/
public void dragGestureRecognized(final DragGestureEvent dge) {
try {
