You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(30) |
Jun
(37) |
Jul
(1) |
Aug
(4) |
Sep
(8) |
Oct
(27) |
Nov
(88) |
Dec
(138) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(117) |
Feb
(33) |
Mar
|
Apr
|
May
|
Jun
(15) |
Jul
|
Aug
(20) |
Sep
(214) |
Oct
(58) |
Nov
|
Dec
(5) |
2006 |
Jan
|
Feb
(23) |
Mar
(249) |
Apr
(168) |
May
(56) |
Jun
(68) |
Jul
(61) |
Aug
(352) |
Sep
(94) |
Oct
(492) |
Nov
(258) |
Dec
(70) |
2007 |
Jan
(152) |
Feb
(183) |
Mar
(97) |
Apr
(92) |
May
|
Jun
(47) |
Jul
(79) |
Aug
(21) |
Sep
(49) |
Oct
(58) |
Nov
(62) |
Dec
(28) |
2008 |
Jan
(26) |
Feb
(34) |
Mar
(11) |
Apr
(9) |
May
(1) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(2) |
Feb
(6) |
Mar
(66) |
Apr
(46) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
(17) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2011 |
Jan
(87) |
Feb
(16) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2012 |
Jan
|
Feb
|
Mar
|
Apr
(10) |
May
(19) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
(2) |
Apr
(53) |
May
(28) |
Jun
(45) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(8) |
Oct
|
Nov
|
Dec
|
From: <jtc...@li...> - 2004-06-04 01:53:38
|
Update of /cvsroot/jtcfrost/frost-wot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14406 Modified Files: HISTORY.txt Log Message: Added: now the user can choose which columns the search, download and upload tables should show. Index: HISTORY.txt =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/HISTORY.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** HISTORY.txt 2 Jun 2004 00:50:12 -0000 1.15 --- HISTORY.txt 4 Jun 2004 01:53:29 -0000 1.16 *************** *** 2,5 **** --- 2,8 ---- Changes since version 28-May-2004 dev: + Added: now the user can choose which columns the search, download and upload tables should show. That + selection is made via a contextual menu that pops up when right clicking on the table header. + Bugfix: when the text in the "Name" column of the uploads table is written in bold and it doesn't fit in the cell it isn't cropped correctly. Fixed now (it no longer uses HTML internally to display |
From: <jtc...@li...> - 2004-06-04 01:50:40
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13991/source/frost/util/model/gui Modified Files: ModelTableHeader.java Log Message: Added: now this table header can show a popup menu to let the user choose which columns the associated table should show. Index: ModelTableHeader.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTableHeader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ModelTableHeader.java 31 May 2004 10:07:54 -0000 1.1 --- ModelTableHeader.java 4 Jun 2004 01:50:31 -0000 1.2 *************** *** 7,14 **** package frost.util.model.gui; import java.awt.event.*; import javax.swing.*; ! import javax.swing.table.JTableHeader; /** --- 7,16 ---- package frost.util.model.gui; + import java.awt.Component; import java.awt.event.*; + import java.util.Iterator; import javax.swing.*; ! import javax.swing.table.*; /** *************** *** 20,28 **** */ public class ModelTableHeader extends JTableHeader { /** ! * This inner class listens for mouse clicks on the header */ ! private class Listener extends MouseAdapter { ! /** * This constructor creates a new instance of Listener --- 22,59 ---- */ public class ModelTableHeader extends JTableHeader { + /** ! * This inner class is the popup menu that will be shown to let the user choose ! * which columns the table should show. */ ! private class ColumnsPopupMenu extends JPopupMenu { ! ! /* (non-Javadoc) ! * @see javax.swing.JPopupMenu#show(java.awt.Component, int, int) ! */ ! public void show(Component invoker, int x, int y) { ! removeAll(); ! Iterator columns = modelTable.getColumns(); ! int i = 0; ! while (columns.hasNext()) { ! TableColumn column = (TableColumn) columns.next(); ! JCheckBoxMenuItem menuItem = ! new JCheckBoxMenuItem(column.getIdentifier().toString()); ! menuItem.setSelected(modelTable.isColumnVisible(i)); ! menuItem.addActionListener(listener); ! add(menuItem); ! i++; ! } ! super.show(invoker, x, y); ! } ! ! } ! ! /** ! * This inner class listens for mouse clicks on the header and ! * for selections in the popup menu ! */ ! private class Listener extends MouseAdapter implements ActionListener { ! /** * This constructor creates a new instance of Listener *************** *** 31,35 **** super(); } ! /* (non-Javadoc) * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) --- 62,66 ---- super(); } ! /* (non-Javadoc) * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) *************** *** 38,42 **** headerClicked(e); } ! /* (non-Javadoc) * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) --- 69,73 ---- headerClicked(e); } ! /* (non-Javadoc) * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) *************** *** 46,53 **** } } ! private Listener listener = new Listener(); /** * This constructor creates a new instance of ModelTableHeader associated --- 77,100 ---- } + /* (non-Javadoc) + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + public void actionPerformed(ActionEvent e) { + if (popup != null) { + int position = popup.getComponentIndex((Component) e.getSource()); + if (position != -1) { + popupMenu_actionPerformed(position); + } + } + } + } ! private Listener listener = new Listener(); + private ModelTable modelTable; + + private ColumnsPopupMenu popup; + /** * This constructor creates a new instance of ModelTableHeader associated *************** *** 58,61 **** --- 105,110 ---- super(newModelTable.getTable().getColumnModel()); + modelTable = newModelTable; + addMouseListener(listener); } *************** *** 67,73 **** */ protected void headerClicked(MouseEvent e) { ! //Nothing here for now. Override as necessary. } ! /** * This method is called whenever the user clicks on the header --- 116,124 ---- */ protected void headerClicked(MouseEvent e) { ! if (e.isPopupTrigger()) { ! getPopupMenu().show(e.getComponent(), e.getX(), e.getY()); ! } } ! /** * This method is called whenever the user clicks on the header *************** *** 76,80 **** */ protected void headerReleased(MouseEvent e) { ! //Nothing here for now. Override as necessary. } --- 127,160 ---- */ protected void headerReleased(MouseEvent e) { ! if (e.isPopupTrigger()) { ! getPopupMenu().show(e.getComponent(), e.getX(), e.getY()); ! } ! } ! ! /** ! * This method is called whenever a MenuItem of the ! * ColumnsPopupMenu is selected ! * @param position the position of the MenuItem in the ! * ColumnsPopupMenu that was selected ! */ ! private void popupMenu_actionPerformed(int position) { ! JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) popup.getComponent(position); ! if (menuItem.isSelected()) { ! modelTable.setColumnVisible(position, true); ! } else { ! modelTable.setColumnVisible(position, false); ! } ! } ! ! /** ! * This method returns a reference to the inner ColumnsPopupMenu, ! * creating one instance of it if it hadn't been created yet. ! * @return an instance of ColumnsPopupMenu ! */ ! private JPopupMenu getPopupMenu() { ! if (popup == null) { ! popup = new ColumnsPopupMenu(); ! } ! return popup; } |
From: <jtc...@li...> - 2004-06-04 00:50:17
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1813/source/frost/util/model/gui Modified Files: ModelTable.java Log Message: Cleanup: some unecessary code removed from method setColumnVisible. One comment added too. Index: ModelTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTable.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ModelTable.java 4 Jun 2004 00:43:02 -0000 1.13 --- ModelTable.java 4 Jun 2004 00:50:06 -0000 1.14 *************** *** 378,387 **** */ public void setColumnVisible(int index, boolean visible) { - TableColumnModelEvent event = - new TableColumnModelEvent(getTable().getColumnModel(), index, index); TableColumnModel columnModel = getTable().getColumnModel(); if (visible) { - int position = visibleColumns.indexOf(new Integer(index)); if (position == -1) { visibleColumns.add(new Integer(index)); --- 378,385 ---- */ public void setColumnVisible(int index, boolean visible) { TableColumnModel columnModel = getTable().getColumnModel(); + int position = visibleColumns.indexOf(new Integer(index)); if (visible) { if (position == -1) { visibleColumns.add(new Integer(index)); *************** *** 391,397 **** } } else { - int position = visibleColumns.indexOf(new Integer(index)); visibleColumns.remove(new Integer(index)); columnModel.removeColumn((TableColumn) columns.get(index)); for (int i = 0; i < columnModel.getColumnCount(); i++) { TableColumn column = columnModel.getColumn(i); --- 389,396 ---- } } else { visibleColumns.remove(new Integer(index)); columnModel.removeColumn((TableColumn) columns.get(index)); + //Here we have to decrease the model index of all the columns + //that were to the right of the one we have removed. for (int i = 0; i < columnModel.getColumnCount(); i++) { TableColumn column = columnModel.getColumn(i); |
From: <jtc...@li...> - 2004-06-04 00:43:20
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv651/source/frost/util/model/gui Modified Files: ModelTable.java Log Message: Added: now the user can choose which columns the table should show (popup menu not implemented yet) Index: ModelTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTable.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ModelTable.java 3 Jun 2004 16:36:17 -0000 1.12 --- ModelTable.java 4 Jun 2004 00:43:02 -0000 1.13 *************** *** 9,24 **** import java.awt.Font; import java.lang.reflect.InvocationTargetException; import java.util.logging.*; import javax.swing.*; ! import javax.swing.table.AbstractTableModel; import frost.util.model.*; /** ! * @author Administrator ! * ! * To change the template for this generated type comment go to ! * Window>Preferences>Java>Code Generation>Code and Comments */ public class ModelTable extends AbstractTableModel { --- 9,35 ---- import java.awt.Font; import java.lang.reflect.InvocationTargetException; + import java.util.*; import java.util.logging.*; import javax.swing.*; ! import javax.swing.event.TableColumnModelEvent; ! import javax.swing.table.*; import frost.util.model.*; /** ! * This subclass of AbstractTableModel is passed an OrderedModel and a ! * TableFormat in the constructor. It then creates a JTable and displays ! * the content of the OrderedModel on it according to the rules specified ! * in the TableFormat. ! * ! * It also listens for changes in the OrderedModel and updates the JTable ! * as necessary. ! * ! * Besides, the user can choose which columns will be shown via a menu ! * that pops up when he right clicks on the header. ! * ! * @author $Author$ ! * @version $Revision$ */ public class ModelTable extends AbstractTableModel { *************** *** 30,34 **** /** ! * */ public Listener() { --- 41,45 ---- /** ! * This constructor creates a new instance of Listener */ public Listener() { *************** *** 42,46 **** int[] columns = tableFormat.getColumnNumbers(fieldID); for (int i = 0; i < columns.length; i++) { ! fireTableCellUpdated(position, columns[i]); } } --- 53,58 ---- int[] columns = tableFormat.getColumnNumbers(fieldID); for (int i = 0; i < columns.length; i++) { ! int columnIndex = visibleColumns.indexOf(new Integer(columns[i])); ! fireTableCellUpdated(position, columnIndex); } } *************** *** 79,83 **** * Helper class to be able to safely get the selection fron any thread */ ! private class SelectionGetter implements Runnable { private final int MODE_SINGLE = 0; --- 91,95 ---- * Helper class to be able to safely get the selection fron any thread */ ! protected class SelectionGetter implements Runnable { private final int MODE_SINGLE = 0; *************** *** 90,94 **** /** ! * */ public ModelItem[] getSelectedItems() { --- 102,108 ---- /** ! * This method returns an array of all the ModelItems that are ! * selected in the JTable. ! * @return an array containing the ModelItems that are selected */ public ModelItem[] getSelectedItems() { *************** *** 109,113 **** /** ! * */ public ModelItem getSelectedItem() { --- 123,132 ---- /** ! * This method returns the ModelItem that is selected in ! * the JTable (or the first one if there are several). If there is ! * none, it returns null. ! * @return the ModelItem that is selected in the JTable, or ! * the first one if there are several. null if there is ! * none. */ public ModelItem getSelectedItem() { *************** *** 127,131 **** } ! /* (non-Javadoc) * @see java.lang.Runnable#run() */ --- 146,153 ---- } ! /** ! * This method is executed in the Swing event thread. It gets the selected items ! * and places them in an attribute so that the methods getSelectedItem and getSelectedItems ! * can return them * @see java.lang.Runnable#run() */ *************** *** 162,168 **** protected JTable table; private JScrollPane scrollPane; /** ! * */ protected ModelTable(ModelTableFormat newTableFormat) { --- 184,204 ---- protected JTable table; private JScrollPane scrollPane; + + /** + * This ArrayList contains the model indexes of the columns that are being shown + */ + protected ArrayList visibleColumns = new ArrayList(); + + /** + * This ArrayList contains all of the TableColumns that this ModelTable may show. + */ + private ArrayList columns = new ArrayList(); /** ! * This method creates an instance of Model table with the given ModelTableFormat ! * but without an OrderedModel. The method setModel should be called before ! * initialization (this constructor does not perform that initialization). ! * @param newTableFormat the ModelTableFormat that defines the visual representation ! * of the data in the OrderedModel. */ protected ModelTable(ModelTableFormat newTableFormat) { *************** *** 173,177 **** /** ! * */ public ModelTable(OrderedModel newModel, ModelTableFormat newTableFormat) { --- 209,217 ---- /** ! * This method creates an instance of Model table with the given ModelTableFormat ! * and OrderedModel and initializes it. ! * @param newModel the OrderedModel that contains the data to be shown on the JTable ! * @param newTableFormat the ModelTableFormat that defines the visual representation ! * of the data in the OrderedModel. */ public ModelTable(OrderedModel newModel, ModelTableFormat newTableFormat) { *************** *** 185,196 **** /** ! * */ protected void initialize() { table = new JTable(this); scrollPane = new JScrollPane(table); tableFormat.addTable(table); tableFormat.customizeTable(this); model.addOrderedModelListener(listener); } --- 225,248 ---- /** ! * This method initializes the ModelTable. It creates the default TableColumns, ! * customizes the JTable and sets up the listener. */ protected void initialize() { + int columnCount = tableFormat.getColumnCount(); + for (int i = 0; i < columnCount; i++) { + visibleColumns.add(new Integer(i)); + } + table = new JTable(this); scrollPane = new JScrollPane(table); tableFormat.addTable(table); + tableFormat.customizeTable(this); + TableColumnModel columnModel = table.getColumnModel(); + for (int i = 0; i < columnModel.getColumnCount(); i++) { + columns.add(columnModel.getColumn(i)); + } + model.addOrderedModelListener(listener); } *************** *** 200,204 **** */ public int getColumnCount() { ! return tableFormat.getColumnCount(); } --- 252,256 ---- */ public int getColumnCount() { ! return visibleColumns.size(); } *************** *** 214,223 **** */ public Object getValueAt(int rowIndex, int columnIndex) { ! return tableFormat.getCellValue(model.getItemAt(rowIndex), columnIndex); } /** ! * @param positions */ protected void fireTableRowsDeleted(int[] positions) { --- 266,279 ---- */ public Object getValueAt(int rowIndex, int columnIndex) { ! Integer index = (Integer) visibleColumns.get(columnIndex); ! return tableFormat.getCellValue(model.getItemAt(rowIndex), index.intValue()); } /** ! * This method is called whenever an event is received from the ! * OrderedModel indicating that several items have been removed from it. ! * @param positions the positions of the ModelItems that have ! * been removed from the OrderedModel. */ protected void fireTableRowsDeleted(int[] positions) { *************** *** 227,232 **** } ! /** ! * @return */ public ModelItem[] getSelectedItems() { --- 283,290 ---- } ! /** ! * This method returns an array of all the ModelItems that are ! * selected in the JTable. ! * @return an array containing the ModelItems that are selected */ public ModelItem[] getSelectedItems() { *************** *** 235,239 **** /** ! * @return */ public ModelItem getSelectedItem() { --- 293,300 ---- /** ! * This method returns the selected ModelItem, or the first one ! * if there was several of them. It returns null if there was none. ! * @return the selected ModelItem, or the first one if there was ! * several of them. null if there was none. */ public ModelItem getSelectedItem() { *************** *** 242,246 **** /** ! * @return */ public int getSelectedCount() { --- 303,308 ---- /** ! * This method returns the number of rows that are selected. ! * @return the number of rows that are selected. */ public int getSelectedCount() { *************** *** 249,253 **** /** ! * @return */ public JScrollPane getScrollPane() { --- 311,316 ---- /** ! * This method returns the JScrollPane the JTable is created into. ! * @return the JScrollPane the JTable is created into. */ public JScrollPane getScrollPane() { *************** *** 259,267 **** */ public String getColumnName(int column) { ! return tableFormat.getColumnName(column); } /** ! * @return */ public JTable getTable() { --- 322,334 ---- */ public String getColumnName(int column) { ! Integer index = (Integer) visibleColumns.get(column); ! return tableFormat.getColumnName(index.intValue()); } /** ! * This method returns the JTable that is used by this ModelTable ! * to show the contents of its OrderedModel. ! * @return the JTable that is used by this ModelTable to show the ! * contents of its OrderedModel. */ public JTable getTable() { *************** *** 270,274 **** /** ! * @param font */ public void setFont(Font font) { --- 337,342 ---- /** ! * This method changes the Font of the JTable in this ModelTable ! * @param font the new font for the JTable in this ModelTable. */ public void setFont(Font font) { *************** *** 281,285 **** */ public boolean isCellEditable(int rowIndex, int columnIndex) { ! return tableFormat.isColumnEditable(columnIndex); } --- 349,405 ---- */ public boolean isCellEditable(int rowIndex, int columnIndex) { ! Integer index = (Integer) visibleColumns.get(columnIndex); ! return tableFormat.isColumnEditable(index.intValue()); ! } ! ! /** ! * This method is used to find out if the column with the given model index ! * is currently being shown or not. ! * @param columnIndex the model index of the column to find out if it is ! * being shown or not. ! * @return true if the column is being shown. false otherwise. ! */ ! public boolean isColumnVisible(int columnIndex) { ! int position = visibleColumns.indexOf(new Integer(columnIndex)); ! if (position != -1) { ! return true; ! } else { ! return false; ! } ! } ! ! /** ! * This method shows or hides a particular column. In case it tries to ! * show a column that is already being shown or to hide a column that is ! * already hidden, the command is simply ignored. ! * @param index the model index of the column to hide or show. ! * @param visible if true, the column will be shown. If false, the column ! * will be hidden. ! */ ! public void setColumnVisible(int index, boolean visible) { ! TableColumnModelEvent event = ! new TableColumnModelEvent(getTable().getColumnModel(), index, index); ! TableColumnModel columnModel = getTable().getColumnModel(); ! ! if (visible) { ! int position = visibleColumns.indexOf(new Integer(index)); ! if (position == -1) { ! visibleColumns.add(new Integer(index)); ! TableColumn column = (TableColumn) columns.get(index); ! column.setModelIndex(visibleColumns.size() - 1); ! columnModel.addColumn(column); ! } ! } else { ! int position = visibleColumns.indexOf(new Integer(index)); ! visibleColumns.remove(new Integer(index)); ! columnModel.removeColumn((TableColumn) columns.get(index)); ! for (int i = 0; i < columnModel.getColumnCount(); i++) { ! TableColumn column = columnModel.getColumn(i); ! int modelIndex = column.getModelIndex(); ! if (modelIndex >= position) { ! column.setModelIndex(modelIndex - 1); ! } ! } ! } } *************** *** 288,296 **** */ public void setValueAt(Object aValue, int rowIndex, int columnIndex) { ! tableFormat.setCellValue(aValue, model.getItemAt(rowIndex), columnIndex); } /** ! * @param model */ protected void setModel(OrderedModel newModel) { --- 408,419 ---- */ public void setValueAt(Object aValue, int rowIndex, int columnIndex) { ! Integer index = (Integer) visibleColumns.get(columnIndex); ! tableFormat.setCellValue(aValue, model.getItemAt(rowIndex), index.intValue()); } /** ! * This method sets a new OrderedModel for the ModelTable (mainly to be ! * used in conjunction with the constructor that is only passed a ModelTableFormat) ! * @param model the OrderedModel this ModelTable will get the data from */ protected void setModel(OrderedModel newModel) { *************** *** 299,307 **** /** ! * This method returns the format of this model table ! * @return the format of this model table */ ! public ModelTableFormat getFormat() { ! return tableFormat; } --- 422,432 ---- /** ! * This method returns an Iterator of all the TableColumns that this ! * ModelTable may show. ! * @return an Iterator of all the TableColumns that this ! * ModelTable may show. */ ! public Iterator getColumns() { ! return columns.iterator(); } |
From: <jtc...@li...> - 2004-06-03 16:46:59
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13337/source/frost/util/model/gui Modified Files: SortedModelTable.java Log Message: Refactoring: SortedModelTable class greatly simplified Index: SortedModelTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/SortedModelTable.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SortedModelTable.java 20 May 2004 12:30:20 -0000 1.5 --- SortedModelTable.java 3 Jun 2004 16:46:50 -0000 1.6 *************** *** 20,103 **** */ public class SortedModelTable extends ModelTable { - /** - * Helper class to be able to safely get the selection fron any thread - */ - private class SortedSelectionGetter implements Runnable { - - private final int MODE_SINGLE = 0; - private final int MODE_MULTIPLE = 1; - - int mode = 0; - - ModelItem[] selectedItems; - ModelItem selectedItem; - - /** - * - */ - public ModelItem[] getSelectedItems() { - mode = MODE_MULTIPLE; - if (SwingUtilities.isEventDispatchThread()) { - run(); - } else { - try { - SwingUtilities.invokeAndWait(this); - } catch (InterruptedException e) { - logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e); - } catch (InvocationTargetException e) { - logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e); - } - } - return selectedItems; - } - - /** - * - */ - public ModelItem getSelectedItem() { - mode = MODE_SINGLE; - if (SwingUtilities.isEventDispatchThread()) { - run(); - } else { - try { - SwingUtilities.invokeAndWait(this); - } catch (InterruptedException e) { - logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e); - } catch (InvocationTargetException e) { - logger.log(Level.WARNING, "Exception thrown in SelectionGetter.run()", e); - } - } - return selectedItem; - } - - /* (non-Javadoc) - * @see java.lang.Runnable#run() - */ - public void run() { - synchronized (sortedModel) { - switch (mode) { - case MODE_MULTIPLE : - int selectionCount = table.getSelectedRowCount(); - selectedItems = new ModelItem[selectionCount]; - int[] selectedRows = table.getSelectedRows(); - for (int i = 0; i < selectedRows.length; i++) { - selectedItems[i] = sortedModel.getItemAt(selectedRows[i]); - } - break; - - case MODE_SINGLE : - int selectedRow = table.getSelectedRow(); - if (selectedRow != -1) { - selectedItem = sortedModel.getItemAt(selectedRow); - - break; - } - } - } - } - } - - private SortedModel sortedModel; - private static Logger logger = Logger.getLogger(SortedModelTable.class.getName()); --- 20,23 ---- *************** *** 115,119 **** super(newTableFormat); ! sortedModel = new SortedModel(newModel, newTableFormat); setModel(sortedModel); initialize(); --- 35,39 ---- super(newTableFormat); ! SortedModel sortedModel = new SortedModel(newModel, newTableFormat); setModel(sortedModel); initialize(); *************** *** 137,141 **** protected void doNonUILogic() throws RuntimeException { ! sortedModel.sort(columnNumberFinal, ascending); } --- 57,61 ---- protected void doNonUILogic() throws RuntimeException { ! ((SortedModel) model).sort(columnNumberFinal, ascending); } *************** *** 150,169 **** /** - * @return - */ - public ModelItem getSelectedItem() { - return new SortedSelectionGetter().getSelectedItem(); - } - - - /** - * @return - */ - public ModelItem[] getSelectedItems() { - return new SortedSelectionGetter().getSelectedItems(); - } - - - /** * This method returns the number of the column the * table is currently sorted by (or -1 if none) --- 70,73 ---- *************** *** 183,193 **** } - /* (non-Javadoc) - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ - public Object getValueAt(int rowIndex, int columnIndex) { - return tableFormat.getCellValue(sortedModel.getItemAt(rowIndex), columnIndex); - } - /** * This method returns the model item that is represented on a particular --- 87,90 ---- *************** *** 197,201 **** */ public ModelItem getItemAt(int rowIndex) { ! return sortedModel.getItemAt(rowIndex); } --- 94,98 ---- */ public ModelItem getItemAt(int rowIndex) { ! return model.getItemAt(rowIndex); } |
From: <jtc...@li...> - 2004-06-03 16:36:26
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11399/source/frost/util/model/gui Modified Files: ModelTable.java Log Message: Refactoring: inner class SelectionGetter made private (instead of protected) Index: ModelTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTable.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ModelTable.java 31 May 2004 10:05:31 -0000 1.11 --- ModelTable.java 3 Jun 2004 16:36:17 -0000 1.12 *************** *** 79,83 **** * Helper class to be able to safely get the selection fron any thread */ ! protected class SelectionGetter implements Runnable { private final int MODE_SINGLE = 0; --- 79,83 ---- * Helper class to be able to safely get the selection fron any thread */ ! private class SelectionGetter implements Runnable { private final int MODE_SINGLE = 0; *************** *** 89,93 **** ModelItem selectedItem; - /** * --- 89,92 ---- |
From: <jtc...@li...> - 2004-06-02 00:54:06
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/upload In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32663/source/frost/fileTransfer/upload Modified Files: UploadTableFormat.java Log Message: Bugfix: HTML is no longer used to display the name in bold, so if the name doesn't fit in the cell, it is correctly cropped now. Index: UploadTableFormat.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/upload/UploadTableFormat.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UploadTableFormat.java 22 May 2004 02:46:50 -0000 1.5 --- UploadTableFormat.java 2 Jun 2004 00:53:53 -0000 1.6 *************** *** 7,11 **** package frost.fileTransfer.upload; ! import java.awt.Component; import java.util.Comparator; --- 7,11 ---- package frost.fileTransfer.upload; ! import java.awt.*; import java.util.Comparator; *************** *** 24,27 **** --- 24,67 ---- */ class UploadTableFormat extends SortedTableFormat implements LanguageListener { + /** + * This inner class implements the renderer for the column "Name" + */ + private class NameRenderer extends DefaultTableCellRenderer { + + private SortedModelTable modelTable; + + /** + * + */ + public NameRenderer(SortedModelTable newModelTable) { + super(); + modelTable = newModelTable; + } + + /* (non-Javadoc) + * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) + */ + public Component getTableCellRendererComponent( + JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + + ModelItem item = modelTable.getItemAt(row); //It may be null + if (item != null) { + FrostUploadItem uploadItem = (FrostUploadItem) item; + if (uploadItem.getSHA1() != null) { + Font font = getFont(); + setFont(font.deriveFont(Font.BOLD)); + } + } + return this; + } + + } /** *************** *** 204,213 **** switch (columnIndex) { case 0 : //Filename ! if (uploadItem.getSHA1() == null) { ! return "<html><font color=\"gray\">" + uploadItem.getFileName() + "</font></html>"; ! } else { ! return "<html><b>" + uploadItem.getFileName() + "</b></html>"; ! } ! case 1 : //Size return uploadItem.getFileSize(); --- 244,249 ---- switch (columnIndex) { case 0 : //Filename ! return uploadItem.getFileName(); ! case 1 : //Size return uploadItem.getFileSize(); *************** *** 291,296 **** } // Column "Size" ! columnModel.getColumn(1).setCellRenderer(new FileSizeRenderer()); } --- 327,335 ---- } + // Column "Name" + columnModel.getColumn(0).setCellRenderer(new NameRenderer((SortedModelTable) modelTable)); + // Column "Size" ! columnModel.getColumn(1).setCellRenderer(new FileSizeRenderer()); } |
From: <jtc...@li...> - 2004-06-02 00:50:21
|
Update of /cvsroot/jtcfrost/frost-wot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32039 Modified Files: HISTORY.txt Log Message: Changed: HISTORY.txt file in use again! Index: HISTORY.txt =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/HISTORY.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** HISTORY.txt 8 Oct 2003 12:37:15 -0000 1.14 --- HISTORY.txt 2 Jun 2004 00:50:12 -0000 1.15 *************** *** 1,2 **** --- 1,11 ---- + + Changes since version 28-May-2004 dev: + + Bugfix: when the text in the "Name" column of the uploads table is written in bold and it doesn't fit + in the cell it isn't cropped correctly. Fixed now (it no longer uses HTML internally to display + it in bold) + + ************************************************************************************************** + Legend: '+' = feature added |
From: <jtc...@li...> - 2004-06-02 00:32:04
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28609/source/frost/fileTransfer/search Modified Files: SearchTableFormat.java Log Message: Optimization: modelTable.getItemAt was being executed twice for no reason Index: SearchTableFormat.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search/SearchTableFormat.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SearchTableFormat.java 2 Jun 2004 00:16:54 -0000 1.4 --- SearchTableFormat.java 2 Jun 2004 00:31:54 -0000 1.5 *************** *** 166,170 **** ModelItem item = modelTable.getItemAt(row); //It may be null if (item != null) { ! FrostSearchItem searchItem = (FrostSearchItem) modelTable.getItemAt(row); if (searchItem.getState() == FrostSearchItem.STATE_DOWNLOADED) { --- 166,170 ---- ModelItem item = modelTable.getItemAt(row); //It may be null if (item != null) { ! FrostSearchItem searchItem = (FrostSearchItem) item; if (searchItem.getState() == FrostSearchItem.STATE_DOWNLOADED) { |
From: <jtc...@li...> - 2004-06-02 00:17:07
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25865/source/frost/fileTransfer/search Modified Files: SearchTableFormat.java Log Message: Refactoring: inner class CellRenderer renamed as FileNameRenderer Index: SearchTableFormat.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search/SearchTableFormat.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SearchTableFormat.java 22 May 2004 02:46:50 -0000 1.3 --- SearchTableFormat.java 2 Jun 2004 00:16:54 -0000 1.4 *************** *** 137,144 **** /** ! * This renderer renders rows in different colors, depending on state of search item. * States are: NONE, DOWNLOADED, DOWNLOADING, UPLOADING */ ! private class CellRenderer extends DefaultTableCellRenderer { private SortedModelTable modelTable; --- 137,145 ---- /** ! * This renderer renders the column "FileName" in different colors, ! * depending on state of search item. * States are: NONE, DOWNLOADED, DOWNLOADING, UPLOADING */ ! private class FileNameRenderer extends DefaultTableCellRenderer { private SortedModelTable modelTable; *************** *** 147,151 **** * */ ! public CellRenderer(SortedModelTable newModelTable) { super(); modelTable = newModelTable; --- 148,152 ---- * */ ! public FileNameRenderer(SortedModelTable newModelTable) { super(); modelTable = newModelTable; *************** *** 329,333 **** // Column FileName ! CellRenderer cellRenderer = new CellRenderer((SortedModelTable) modelTable); columnModel.getColumn(0).setCellRenderer(cellRenderer); --- 330,334 ---- // Column FileName ! FileNameRenderer cellRenderer = new FileNameRenderer((SortedModelTable) modelTable); columnModel.getColumn(0).setCellRenderer(cellRenderer); |
From: <jtc...@li...> - 2004-05-31 10:11:47
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32123/source/frost/util/model/gui Modified Files: SortedTableHeader.java Log Message: Refactoring: now this class has a superclass. The inner class Listener has been moved to it. Index: SortedTableHeader.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/SortedTableHeader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SortedTableHeader.java 4 May 2004 16:10:41 -0000 1.2 --- SortedTableHeader.java 31 May 2004 10:11:36 -0000 1.3 *************** *** 17,33 **** /** ! * @author Administrator ! * ! * To change the template for this generated type comment go to ! * Window>Preferences>Java>Code Generation>Code and Comments */ ! class SortedTableHeader extends JTableHeader { /** ! * */ private class ArrowRenderer implements TableCellRenderer { /** ! * */ public ArrowRenderer() { --- 17,37 ---- /** ! * This is subclass of ModelTableHeader that listens for mouse clicks on it. ! * When the user clicks on the header of one column, it notifies the associated ! * SortedModelTable of the event, so that it can change its sorting. ! * It also paints arrows on the header depending of that sorting. ! * @author $Author$ ! * @version $Revision$ */ ! class SortedTableHeader extends ModelTableHeader { /** ! * This inner class paints an arrow on the header of the column the model ! * table is sorted by. The arrow will point upwards or downwards depending ! * if the sorting is ascending or descending. */ private class ArrowRenderer implements TableCellRenderer { /** ! * This constructor creates a new instance of ArrowRenderer */ public ArrowRenderer() { *************** *** 40,43 **** --- 44,48 ---- * (like DefaultTableCellRenderer), it paints an arrow if necessary. Then, * it calls the defaultRenderer so that it finishes the job. + * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) */ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { *************** *** 63,93 **** } - /** - * - */ - private class Listener extends MouseAdapter { - - /** - * - */ - public Listener() { - super(); - } - - /* (non-Javadoc) - * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) - */ - public void mouseClicked(MouseEvent e) { - TableColumnModel columnModel = getTable().getColumnModel(); - int columnNumber = columnModel.getColumnIndexAtX(e.getX()); - if (columnNumber != -1) { - //This translation is done so the real column number is used when the user moves columns around. - int modelIndex = columnModel.getColumn(columnNumber).getModelIndex(); - sortedTable.columnClicked(modelIndex); - } - } - - } - private static Logger logger = Logger.getLogger(SortedTableHeader.class.getName()); --- 68,71 ---- *************** *** 96,103 **** private ArrowRenderer arrowRenderer = new ArrowRenderer(); - private Listener listener = new Listener(); private SortedModelTable sortedTable; static { URL ascencingURL = SortedModelTable.class.getResource("/data/SortedTable_ascending.png"); --- 74,83 ---- private ArrowRenderer arrowRenderer = new ArrowRenderer(); private SortedModelTable sortedTable; + /** + * This static initializer loads the images of the arrows (both ascending and descending) + */ static { URL ascencingURL = SortedModelTable.class.getResource("/data/SortedTable_ascending.png"); *************** *** 116,123 **** /** ! * @param cm */ public SortedTableHeader(SortedModelTable newSortedTable) { ! super(newSortedTable.getTable().getColumnModel()); sortedTable = newSortedTable; --- 96,105 ---- /** ! * This constructor creates a new instance of ModelTableHeader associated ! * to the SortedModelTable that is passed as a parameter. ! * @param cm the SortedModelTable that is going to have this header */ public SortedTableHeader(SortedModelTable newSortedTable) { ! super(newSortedTable); sortedTable = newSortedTable; *************** *** 129,133 **** column.setHeaderRenderer(arrowRenderer); } ! addMouseListener(listener); } --- 111,133 ---- column.setHeaderRenderer(arrowRenderer); } ! } ! ! /** ! * This method is called by the superclass when the user clicks on a column (the mouse ! * button is pressed). It gets the number of the column whose header was clicked and ! * notifies the associated SortedModelTable of the event. ! * @see frost.util.model.gui.ModelTableHeader#headerClicked(java.awt.event.MouseEvent) ! */ ! protected void headerClicked(MouseEvent e) { ! super.headerClicked(e); ! if (e.getButton() == MouseEvent.BUTTON1) { ! TableColumnModel columnModel = getTable().getColumnModel(); ! int columnNumber = columnModel.getColumnIndexAtX(e.getX()); ! if (columnNumber != -1) { ! //This translation is done so the real column number is used when the user moves columns around. ! int modelIndex = columnModel.getColumn(columnNumber).getModelIndex(); ! sortedTable.columnClicked(modelIndex); ! } ! } } |
From: <jtc...@li...> - 2004-05-31 10:08:03
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31594/source/frost/util/model/gui Added Files: ModelTableHeader.java Log Message: Refactoring: new superclass of SortedTableHeader added. It listens to mouse clicks but does nothing with them (although it provides two methods that subclasses can override to deal with them) --- NEW FILE: ModelTableHeader.java --- /* * Created on May 31, 2004 * * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ package frost.util.model.gui; import java.awt.event.*; import javax.swing.*; import javax.swing.table.JTableHeader; /** * This is subclass of JTableHeader that listens for mouse clicks on it. * It does nothing with them, but provides a couple of methods (headerClicked * and headerReleased) that subclasses can override as necessary. * @author $Author: kevloral $ * @version $Revision: 1.1 $ */ public class ModelTableHeader extends JTableHeader { /** * This inner class listens for mouse clicks on the header */ private class Listener extends MouseAdapter { /** * This constructor creates a new instance of Listener */ public Listener() { super(); } /* (non-Javadoc) * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) */ public void mouseClicked(MouseEvent e) { headerClicked(e); } /* (non-Javadoc) * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { headerReleased(e); } } private Listener listener = new Listener(); /** * This constructor creates a new instance of ModelTableHeader associated * to the ModelTable that is passed as a parameter. * @param cm the ModelTable that is going to have this header */ public ModelTableHeader(ModelTable newModelTable) { super(newModelTable.getTable().getColumnModel()); addMouseListener(listener); } /** * This method is called whenever the user clicks on the header * (when the mouse button is pressed) * @param e the MouseEvent */ protected void headerClicked(MouseEvent e) { //Nothing here for now. Override as necessary. } /** * This method is called whenever the user clicks on the header * (when the mouse button is released) * @param e the MouseEvent */ protected void headerReleased(MouseEvent e) { //Nothing here for now. Override as necessary. } } |
From: <jtc...@li...> - 2004-05-31 10:05:41
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31270/source/frost/util/model/gui Modified Files: ModelTable.java Log Message: Added: new method getFormat() so other classes can get the ModelTableFormat of this ModelTable Index: ModelTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/util/model/gui/ModelTable.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ModelTable.java 20 May 2004 11:38:28 -0000 1.10 --- ModelTable.java 31 May 2004 10:05:31 -0000 1.11 *************** *** 299,301 **** --- 299,309 ---- } + /** + * This method returns the format of this model table + * @return the format of this model table + */ + public ModelTableFormat getFormat() { + return tableFormat; + } + } |
From: <jtc...@li...> - 2004-05-30 13:09:24
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25876/source/frost Modified Files: Index.java Log Message: Code layout improved: sort members and format (with eclipse). Some javadocs comments added. Index: Index.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/Index.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Index.java 30 May 2004 10:49:36 -0000 1.72 --- Index.java 30 May 2004 13:09:14 -0000 1.73 *************** *** 28,431 **** import frost.messages.*; ! public class Index ! { ! /** ! * Calculates keys that should be uploaded to the keyindex ! * @param board The boardsname (in filename type) ! * @return Vector with SharedFileObject objects ! */ private static Logger logger = Logger.getLogger(Index.class.getName()); ! private static final String fileSeparator = ! System.getProperty("file.separator"); ! //this method puts the SharedFileObjects into the target set and ! //returns the number of the files shared by the user himself ! public static Map getUploadKeys(String board) ! { ! ! boolean reSharing = false; ! boolean newFiles = false; ! ! FrostIndex totalIdx=null; ! FrostIndex _toUpload = null; ! ! logger.fine("Index.getUploadKeys(" + board + ")"); ! ! //final String fileSeparator = System.getProperty("file.separator"); ! // Abort if boardDir does not exist ! File boardNewUploads = ! new File(MainFrame.keypool + board + fileSeparator + "new_files.xml"); ! // if( !boardNewUploads.exists() ) ! // return 0; ! File boardFiles = ! new File(MainFrame.keypool + board + fileSeparator + "files.xml"); ! ! totalIdx = FileAccess.readKeyFile(boardFiles); ! ! _toUpload =FileAccess.readKeyFile(boardNewUploads); ! ! if (boardNewUploads.exists()) { ! ! newFiles = true; ! boardNewUploads.delete(); ! } ! ! ! Map toUpload = _toUpload.getFilesMap(); ! ! //add friends's files ! // TODO: add a limit ! ! Iterator i = totalIdx.getFiles().iterator(); ! int downloadBack = ! MainFrame.frostSettings.getIntValue("maxAge"); ! logger.info("re-sharing files shared before " + DateFun.getDate(downloadBack)); ! while (i.hasNext()) ! { ! SharedFileObject current = (SharedFileObject)i.next(); ! if (current.getOwner() != null ! && //not anonymous ! Core.getInstance().getIdentities().getMyId().getUniqueName().compareTo( ! current.getOwner()) ! != 0 ! && //not myself ! MainFrame.frostSettings.getBoolValue("helpFriends") ! && //and helping is enabled ! ( ! Core.getInstance().getIdentities().getFriends().containsKey( ! Mixed.makeFilename( ! current.getOwner())))) //and marked GOOD ! { ! toUpload.put(current.getSHA1(),current); ! logger.fine("f"); //f means added file from friend ! } ! //also add the file if its been shared too long ago ! if (current.getOwner() != null ! && //not anonymous ! current.getOwner().compareTo( ! Core.getInstance().getIdentities().getMyId().getUniqueName()) ! == 0 ! && //from myself ! current.getLastSharedDate() != null) ! { //not from the old format ! if (DateFun ! .getDate(downloadBack) ! .compareTo(current.getLastSharedDate()) ! > 0) ! { ! //if the file has been uploaded too long ago, ! //set it to offline again ! if (!current.checkDate()) { ! current.setDate(null); ! current.setKey(null); ! logger.fine("o"); //o means assumed fallen off freenet ! //NOTE: This will not remove the CHK from the upload table. ! //however, when the other side receives the index they will see the file "offline" ! } ! toUpload.put(current.getSHA1(),current); ! logger.fine("d"); ! current.setLastSharedDate(DateFun.getDate()); ! reSharing=true; ! //d means it was shared too long ago ! } ! } ! } ! //update the lastSharedDate of the shared files ! if (reSharing) ! FileAccess.writeKeyFile(totalIdx, boardFiles); ! ! //return anything only if we either re-shared old files or ! //have new files to upload. ! if (reSharing || newFiles) { ! ! //update the last shared date ! Iterator it2 = toUpload.values().iterator(); ! while(it2.hasNext()) { ! SharedFileObject obj = (SharedFileObject)it2.next(); ! obj.setLastSharedDate(DateFun.getDate()); ! } ! ! return toUpload; ! } ! else ! return null; ! } ! public static void add(SharedFileObject key, FrostBoardObject board) ! { ! //final String fileSeparator = System.getProperty("file.separator"); ! File boardDir = new File(MainFrame.keypool+board.getBoardFilename()); ! ! if (!(boardDir.exists() && boardDir.isDirectory())) ! boardDir.mkdir(); ! if (key.getKey() != null) ! updateDownloadTable(key); ! add( ! key, ! new File( ! MainFrame.keypool ! + board.getBoardFilename() ! + fileSeparator ! + "files.xml")); ! } ! public static void addMine(SharedFileObject key, FrostBoardObject board) ! { ! //final String fileSeparator = System.getProperty("file.separator"); ! File boardDir = new File(MainFrame.keypool + board.getBoardFilename()); ! ! if (!(boardDir.exists() && boardDir.isDirectory())) ! boardDir.mkdir(); ! add( ! key, ! new File(boardDir.getPath() + fileSeparator + "new_files.xml")); ! } ! public static void add( ! File keyFile, ! FrostBoardObject board, ! Identity owner) ! { ! add( ! keyFile, ! new File( ! MainFrame.keypool ! + board.getBoardFilename() ! + fileSeparator ! + "files.xml"), ! owner); ! } ! /** ! * Adds a key object to an index located at target dir. ! * Target dir will be created if it does not exist ! * @param key the key to add to the index ! * @param target directory containing index ! */ ! private static void add(SharedFileObject key, File target) ! { ! //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; ! //final String fileSeparator = System.getProperty("file.separator"); ! final String hash = key.getSHA1(); ! if (key.getKey() != null) ! updateDownloadTable(key); ! ! final Map chk = Collections.synchronizedMap(new HashMap()); ! // File indexFile = new File(target.getPath() + fileSeparator + "files.xml"); ! File indexFile = target; ! try ! { ! if (!indexFile.exists()) ! indexFile.createNewFile(); ! } ! catch (IOException e) ! { ! logger.log(Level.SEVERE, "Exception thrown in add(SharedFileObject key, File target)", e); ! } ! FrostIndex idx = FileAccess.readKeyFile(indexFile); ! if (idx == null) idx = new FrostIndex(new HashMap()); ! if (idx.getFiles().contains(key)) ! idx.getFiles().remove(key); ! idx.getFilesMap().put(key.getSHA1(),key); ! FileAccess.writeKeyFile(idx, indexFile); ! } ! /** ! * Adds a keyfile to another counts the number of files shared ! * and establishes the proper trust relationships ! * @param keyfile the keyfile to add to the index ! * @param target file containing index ! * @param owner the trusted identity of the person sharing the files ! */ ! //REDFLAG: this method is called only from UpdateIdThread and that's why ! //I put the accounting for trustmap here. Be careful when you change it!! ! private static void add(File keyfile, File target, Identity owner) ! { ! try ! { ! if (!target.exists()) ! target.createNewFile(); ! } ! catch (IOException e) ! { ! logger.log(Level.SEVERE, "Exception thrown in add(File keyfile, File target, Identity owner)", e); ! } ! FrostIndex chunk = FileAccess.readKeyFile(keyfile); ! Iterator it = chunk.getFiles().iterator(); ! if (!owner.getUniqueName().equals(Core.getInstance().getIdentities().getMyId().getUniqueName())) ! while (it.hasNext()) ! { ! SharedFileObject current = (SharedFileObject)it.next(); ! if (!current.getOwner().equals(owner.getUniqueName())) ! owner.getTrustees().add(current.getOwner()); ! //FIXME: find a way to count the files each person has shared ! //without counting dublicates ! } ! add(chunk, target); ! } ! /** ! * adds the files from an index shared by an untrusted identity. ! * only those files shared directly by the person who inserted the index ! * are considered. ! * @param keyfile the newly downloaded keyfile ! * @param target the already existing keyfile ! * @param owner the unique name of the person who shared the file ! */ ! private static void add(File keyfile, File target, String owner) ! { ! try ! { ! if (!target.exists()) ! target.createNewFile(); ! } ! catch (IOException e) ! { ! logger.log(Level.SEVERE, "Exception thrown in add(File keyfile, File target, String owner)", e); ! } ! FrostIndex idx = FileAccess.readKeyFile(keyfile); ! add(idx, target, owner); ! } ! ! private static void add(FrostIndex a, File b){ ! add(a.getFilesMap(),b); ! } ! /** ! * Adds a Map to an index located at target dir. ! * Target dir will be created if it does not exist ! * @param chunk the map to add to the index ! * @param target directory containing index ! * @param firstLetter identifier for the keyfile ! */ ! private static void add(Map chunk, File target) ! { ! //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; ! // final String fileSeparator = System.getProperty("file.separator"); ! //final Map whole = Collections.synchronizedMap(new HashMap()); ! FrostIndex whole = FileAccess.readKeyFile(target); ! //if( !target.isDirectory() && !target.getPath().endsWith("xml")) ! // target.mkdir(); ! Iterator i = chunk.values().iterator(); ! while (i.hasNext()) ! { ! SharedFileObject current = (SharedFileObject)i.next(); ! //update the download table ! if (current.getKey() != null) ! updateDownloadTable(current); ! SharedFileObject old = ! (SharedFileObject)whole.getFilesMap().get(current.getSHA1()); ! if (old == null) ! { ! whole.getFilesMap().put(current.getSHA1(), current); ! continue; ! } ! old.setDate(current.getDate()); ! old.setLastSharedDate(current.getLastSharedDate()); ! old.setKey(current.getKey()); ! //TODO: allow unsigned files to be appropriated ! } ! FileAccess.writeKeyFile(whole, target); ! } ! public static void add(FrostIndex a, FrostBoardObject b, String owner){ ! add(a.getFilesMap(),new File(MainFrame.keypool+b.getBoardFilename()+File.separator+"files.xml"),owner); } ! private static void add(FrostIndex a, File b, String owner){ ! add(a.getFilesMap(),b,owner); } ! ! private static void add(Map chunk, File target, String owner) ! { ! ! if (owner == null) ! owner = "Anonymous"; ! FrostIndex idx = null; ! if (target.exists()) ! idx = FileAccess.readKeyFile(target); ! else ! idx = new FrostIndex(new HashMap()); ! ! ! //if( !target.isDirectory() && !target.getPath().endsWith("xml")) ! // target.mkdir(); ! Iterator i = chunk.values().iterator(); ! while (i.hasNext()) ! { ! SharedFileObject current = (SharedFileObject)i.next(); ! if (current.getOwner() != null ! && !current.getOwner().equals(owner)) ! continue; ! //update the download table ! if (current.getKey() != null) ! updateDownloadTable(current); ! SharedFileObject old = ! (SharedFileObject)idx.getFilesMap().get(current.getSHA1()); ! if (old == null) ! { ! idx.getFilesMap().put(current.getSHA1(), current); ! continue; ! } ! old.setDate(current.getDate()); ! old.setLastSharedDate(current.getLastSharedDate()); ! old.setKey(current.getKey()); ! //TODO: allow unsigned files to be appropriated ! } ! FileAccess.writeKeyFile(idx, target); ! } ! private static void updateDownloadTable(SharedFileObject key) ! { ! //this really shouldn't happen ! if (key == null || key.getSHA1() == null) ! { ! logger.warning("null value in index.updateDownloadTable"); ! if (key != null) ! logger.warning("SHA1 null!"); ! else ! logger.warning("key null!"); ! return; ! } ! DownloadModel dlModel = ! (DownloadModel)MainFrame ! .getInstance() ! .getDownloadModel(); ! for (int i = 0; i < dlModel.getItemCount(); i++) ! { ! FrostDownloadItem dlItem = ! (FrostDownloadItem)dlModel.getItemAt(i); ! if (dlItem.getState() == FrostDownloadItem.STATE_REQUESTED ! && dlItem.getSHA1() != null ! && dlItem.getSHA1().compareTo(key.getSHA1()) == 0) ! { ! dlItem.setKey(key.getKey()); ! dlItem.setFileAge(key.getDate()); ! break; ! } ! } ! } } --- 28,425 ---- import frost.messages.*; ! public class Index { ! ! private static final String fileSeparator = System.getProperty("file.separator"); ! /** ! * Calculates keys that should be uploaded to the keyindex ! * @param board The boardsname (in filename type) ! * @return Vector with SharedFileObject objects ! */ private static Logger logger = Logger.getLogger(Index.class.getName()); ! /** ! * Adds a keyfile to another counts the number of files shared ! * and establishes the proper trust relationships ! * @param keyfile the keyfile to add to the index ! * @param target file containing index ! * @param owner the trusted identity of the person sharing the files ! */ ! //REDFLAG: this method is called only from UpdateIdThread and that's why ! //I put the accounting for trustmap here. Be careful when you change it!! ! private static void add(File keyfile, File target, Identity owner) { ! try { ! if (!target.exists()) ! target.createNewFile(); ! } catch (IOException e) { ! logger.log( ! Level.SEVERE, ! "Exception thrown in add(File keyfile, File target, Identity owner)", ! e); ! } ! FrostIndex chunk = FileAccess.readKeyFile(keyfile); ! Iterator it = chunk.getFiles().iterator(); ! if (!owner ! .getUniqueName() ! .equals(Core.getInstance().getIdentities().getMyId().getUniqueName())) ! while (it.hasNext()) { ! SharedFileObject current = (SharedFileObject) it.next(); ! if (!current.getOwner().equals(owner.getUniqueName())) ! owner.getTrustees().add(current.getOwner()); ! //FIXME: find a way to count the files each person has shared ! //without counting duplicates ! } + add(chunk, target); + } ! /** ! * adds the files from an index shared by an untrusted identity. ! * only those files shared directly by the person who inserted the index ! * are considered. ! * @param keyfile the newly downloaded keyfile ! * @param target the already existing keyfile ! * @param owner the unique name of the person who shared the file ! */ ! private static void add(File keyfile, File target, String owner) { ! try { ! if (!target.exists()) ! target.createNewFile(); ! } catch (IOException e) { ! logger.log( ! Level.SEVERE, ! "Exception thrown in add(File keyfile, File target, String owner)", ! e); ! } ! FrostIndex idx = FileAccess.readKeyFile(keyfile); ! add(idx, target, owner); ! } ! /** ! * @param keyFile ! * @param board ! * @param owner ! */ ! public static void add(File keyFile, FrostBoardObject board, Identity owner) { ! add( ! keyFile, ! new File(MainFrame.keypool + board.getBoardFilename() + fileSeparator + "files.xml"), ! owner); ! } ! /** ! * @param a ! * @param b ! */ ! private static void add(FrostIndex a, File b) { ! add(a.getFilesMap(), b); ! } ! /** ! * @param a ! * @param b ! * @param owner ! */ ! private static void add(FrostIndex a, File b, String owner) { ! add(a.getFilesMap(), b, owner); ! } ! /** ! * @param a ! * @param b ! * @param owner ! */ ! public static void add(FrostIndex a, FrostBoardObject b, String owner) { ! add( ! a.getFilesMap(), ! new File(MainFrame.keypool + b.getBoardFilename() + File.separator + "files.xml"), ! owner); ! } ! /** ! * Adds a Map to an index located at target dir. ! * Target dir will be created if it does not exist ! * @param chunk the map to add to the index ! * @param target directory containing index ! * @param firstLetter identifier for the keyfile ! */ ! private static void add(Map chunk, File target) { ! //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; ! // final String fileSeparator = System.getProperty("file.separator"); ! //final Map whole = Collections.synchronizedMap(new HashMap()); ! FrostIndex whole = FileAccess.readKeyFile(target); ! //if( !target.isDirectory() && !target.getPath().endsWith("xml")) ! // target.mkdir(); ! Iterator i = chunk.values().iterator(); ! while (i.hasNext()) { ! SharedFileObject current = (SharedFileObject) i.next(); ! //update the download table ! if (current.getKey() != null) ! updateDownloadTable(current); ! SharedFileObject old = (SharedFileObject) whole.getFilesMap().get(current.getSHA1()); ! if (old == null) { ! whole.getFilesMap().put(current.getSHA1(), current); ! continue; ! } ! old.setDate(current.getDate()); ! old.setLastSharedDate(current.getLastSharedDate()); ! old.setKey(current.getKey()); ! //TODO: allow unsigned files to be appropriated ! } ! FileAccess.writeKeyFile(whole, target); ! } ! /** ! * @param chunk ! * @param target ! * @param owner ! */ ! private static void add(Map chunk, File target, String owner) { ! if (owner == null) ! owner = "Anonymous"; ! FrostIndex idx = null; ! if (target.exists()) ! idx = FileAccess.readKeyFile(target); ! else ! idx = new FrostIndex(new HashMap()); ! //if( !target.isDirectory() && !target.getPath().endsWith("xml")) ! // target.mkdir(); ! Iterator i = chunk.values().iterator(); ! while (i.hasNext()) { ! SharedFileObject current = (SharedFileObject) i.next(); ! if (current.getOwner() != null && !current.getOwner().equals(owner)) ! continue; ! //update the download table ! if (current.getKey() != null) ! updateDownloadTable(current); ! SharedFileObject old = (SharedFileObject) idx.getFilesMap().get(current.getSHA1()); ! if (old == null) { ! idx.getFilesMap().put(current.getSHA1(), current); ! continue; ! } ! old.setDate(current.getDate()); ! old.setLastSharedDate(current.getLastSharedDate()); ! old.setKey(current.getKey()); ! //TODO: allow unsigned files to be appropriated ! } ! FileAccess.writeKeyFile(idx, target); ! } ! /** ! * Adds a key object to an index located at target dir. ! * Target dir will be created if it does not exist ! * @param key the key to add to the index ! * @param target directory containing index ! */ ! private static void add(SharedFileObject key, File target) { ! //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; ! //final String fileSeparator = System.getProperty("file.separator"); ! final String hash = key.getSHA1(); ! if (key.getKey() != null) ! updateDownloadTable(key); ! final Map chk = Collections.synchronizedMap(new HashMap()); ! // File indexFile = new File(target.getPath() + fileSeparator + "files.xml"); ! File indexFile = target; ! try { ! if (!indexFile.exists()) ! indexFile.createNewFile(); ! } catch (IOException e) { ! logger.log( ! Level.SEVERE, ! "Exception thrown in add(SharedFileObject key, File target)", ! e); ! } ! FrostIndex idx = FileAccess.readKeyFile(indexFile); ! if (idx == null) ! idx = new FrostIndex(new HashMap()); ! if (idx.getFiles().contains(key)) ! idx.getFiles().remove(key); ! idx.getFilesMap().put(key.getSHA1(), key); ! FileAccess.writeKeyFile(idx, indexFile); ! } ! /** ! * @param key ! * @param board ! */ ! public static void add(SharedFileObject key, FrostBoardObject board) { ! //final String fileSeparator = System.getProperty("file.separator"); ! File boardDir = new File(MainFrame.keypool + board.getBoardFilename()); ! ! if (!(boardDir.exists() && boardDir.isDirectory())) ! boardDir.mkdir(); ! if (key.getKey() != null) ! updateDownloadTable(key); ! add( ! key, ! new File(MainFrame.keypool + board.getBoardFilename() + fileSeparator + "files.xml")); } ! ! /** ! * @param key ! * @param board ! */ ! public static void addMine(SharedFileObject key, FrostBoardObject board) { ! //final String fileSeparator = System.getProperty("file.separator"); ! File boardDir = new File(MainFrame.keypool + board.getBoardFilename()); ! ! if (!(boardDir.exists() && boardDir.isDirectory())) ! boardDir.mkdir(); ! add(key, new File(boardDir.getPath() + fileSeparator + "new_files.xml")); } ! /** ! * This method puts the SharedFileObjects into the target set and ! * returns the number of the files shared by the user himself ! * @param board ! * @return ! */ ! public static Map getUploadKeys(String board) { ! boolean reSharing = false; ! boolean newFiles = false; ! FrostIndex totalIdx = null; ! FrostIndex _toUpload = null; ! logger.fine("Index.getUploadKeys(" + board + ")"); ! //final String fileSeparator = System.getProperty("file.separator"); ! // Abort if boardDir does not exist ! File boardNewUploads = ! new File(MainFrame.keypool + board + fileSeparator + "new_files.xml"); ! // if( !boardNewUploads.exists() ) ! // return 0; ! File boardFiles = new File(MainFrame.keypool + board + fileSeparator + "files.xml"); ! totalIdx = FileAccess.readKeyFile(boardFiles); ! _toUpload = FileAccess.readKeyFile(boardNewUploads); ! ! if (boardNewUploads.exists()) { ! ! newFiles = true; ! boardNewUploads.delete(); ! } ! ! Map toUpload = _toUpload.getFilesMap(); ! ! //add friends's files ! // TODO: add a limit ! ! Iterator i = totalIdx.getFiles().iterator(); ! int downloadBack = MainFrame.frostSettings.getIntValue("maxAge"); ! logger.info("re-sharing files shared before " + DateFun.getDate(downloadBack)); ! while (i.hasNext()) { ! SharedFileObject current = (SharedFileObject) i.next(); ! if (current.getOwner() != null ! && //not anonymous ! Core ! .getInstance() ! .getIdentities() ! .getMyId() ! .getUniqueName() ! .compareTo( ! current.getOwner()) ! != 0 ! && //not myself ! MainFrame.frostSettings.getBoolValue("helpFriends") ! && //and helping is enabled ! ( ! Core.getInstance().getIdentities().getFriends().containsKey( ! Mixed.makeFilename(current.getOwner())))) //and marked GOOD ! { ! toUpload.put(current.getSHA1(), current); ! logger.fine("f"); //f means added file from friend ! } ! //also add the file if its been shared too long ago ! if (current.getOwner() != null ! && //not anonymous ! current.getOwner().compareTo( ! Core.getInstance().getIdentities().getMyId().getUniqueName()) ! == 0 ! && //from myself ! current.getLastSharedDate() != null) { //not from the old format ! ! if (DateFun.getDate(downloadBack).compareTo(current.getLastSharedDate()) > 0) { ! //if the file has been uploaded too long ago, ! //set it to offline again ! if (!current.checkDate()) { ! current.setDate(null); ! current.setKey(null); ! logger.fine("o"); //o means assumed fallen off freenet ! //NOTE: This will not remove the CHK from the upload table. ! //however, when the other side receives the index they will see the file "offline" ! } ! toUpload.put(current.getSHA1(), current); ! logger.fine("d"); ! current.setLastSharedDate(DateFun.getDate()); ! reSharing = true; ! //d means it was shared too long ago ! } ! } ! } ! ! //update the lastSharedDate of the shared files ! if (reSharing) ! FileAccess.writeKeyFile(totalIdx, boardFiles); ! ! //return anything only if we either re-shared old files or ! //have new files to upload. ! if (reSharing || newFiles) { ! ! //update the last shared date ! Iterator it2 = toUpload.values().iterator(); ! while (it2.hasNext()) { ! SharedFileObject obj = (SharedFileObject) it2.next(); ! obj.setLastSharedDate(DateFun.getDate()); ! } ! ! return toUpload; ! } else ! return null; ! } ! ! /** ! * @param key ! */ ! private static void updateDownloadTable(SharedFileObject key) { ! //this really shouldn't happen ! if (key == null || key.getSHA1() == null) { ! logger.warning("null value in index.updateDownloadTable"); ! if (key != null) ! logger.warning("SHA1 null!"); ! else ! logger.warning("key null!"); ! return; ! } ! ! DownloadModel dlModel = (DownloadModel) MainFrame.getInstance().getDownloadModel(); ! for (int i = 0; i < dlModel.getItemCount(); i++) { ! FrostDownloadItem dlItem = (FrostDownloadItem) dlModel.getItemAt(i); ! if (dlItem.getState() == FrostDownloadItem.STATE_REQUESTED ! && dlItem.getSHA1() != null ! && dlItem.getSHA1().compareTo(key.getSHA1()) == 0) { ! dlItem.setKey(key.getKey()); ! dlItem.setFileAge(key.getDate()); ! break; ! } ! ! } ! } } |
From: <jtc...@li...> - 2004-05-30 10:49:46
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29664/source/frost Modified Files: Index.java Log Message: Refactoring: removed several unused methods and reduced the visibility of others Index: Index.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/Index.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Index.java 22 May 2004 02:53:40 -0000 1.71 --- Index.java 30 May 2004 10:49:36 -0000 1.72 *************** *** 40,79 **** private static final String fileSeparator = System.getProperty("file.separator"); - public static SharedFileObject getKey(String SHA1, FrostBoardObject board) - { - return getKey(SHA1, board.getBoardFilename()); - } - - public static SharedFileObject getKey(String SHA1, String board) - { - - //final String fileSeparator = System.getProperty("file.separator"); - - File keyFile = - new File(MainFrame.keypool + board + fileSeparator + "files.xml"); - - //if no such file exists, return null - if (!keyFile.exists()) - { - logger.warning("keyfile didn't exist??"); - return null; - } - - FrostIndex idx = FileAccess.readKeyFile(keyFile); - if (idx.getFilesMap().containsKey(SHA1)) - return (SharedFileObject)idx.getFilesMap().get(SHA1); - - // then try the recently uploaded files - keyFile = - new File( - MainFrame.keypool + board + fileSeparator + "new_files.xml"); - idx = FileAccess.readKeyFile(keyFile); - if (idx.getFilesMap().containsKey(SHA1)) - return (SharedFileObject)idx.getFilesMap().get(SHA1); - - return null; - - } - //this method puts the SharedFileObjects into the target set and //returns the number of the files shared by the user himself --- 40,43 ---- *************** *** 240,254 **** owner); } - public static void add(File keyFile, FrostBoardObject board, String owner) - { - add( - keyFile, - new File( - MainFrame.keypool - + board.getBoardFilename() - + fileSeparator - + "files.xml"), - owner); - } /** * Adds a key object to an index located at target dir. --- 204,207 ---- *************** *** 257,261 **** * @param target directory containing index */ ! public static void add(SharedFileObject key, File target) { //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; --- 210,214 ---- * @param target directory containing index */ ! private static void add(SharedFileObject key, File target) { //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; *************** *** 296,304 **** //REDFLAG: this method is called only from UpdateIdThread and that's why //I put the accounting for trustmap here. Be careful when you change it!! ! public static void add(File keyfile, File target, Identity owner) { - - - try { --- 249,254 ---- //REDFLAG: this method is called only from UpdateIdThread and that's why //I put the accounting for trustmap here. Be careful when you change it!! ! private static void add(File keyfile, File target, Identity owner) { try { *************** *** 333,337 **** * @param owner the unique name of the person who shared the file */ ! public static void add(File keyfile, File target, String owner) { try --- 283,287 ---- * @param owner the unique name of the person who shared the file */ ! private static void add(File keyfile, File target, String owner) { try *************** *** 349,353 **** } ! public static void add(FrostIndex a, File b){ add(a.getFilesMap(),b); } --- 299,303 ---- } ! private static void add(FrostIndex a, File b){ add(a.getFilesMap(),b); } *************** *** 359,363 **** * @param firstLetter identifier for the keyfile */ ! protected static void add(Map chunk, File target) { //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; --- 309,313 ---- * @param firstLetter identifier for the keyfile */ ! private static void add(Map chunk, File target) { //final String split = "abcdefghijklmnopqrstuvwxyz1234567890"; *************** *** 399,407 **** add(a.getFilesMap(),new File(MainFrame.keypool+b.getBoardFilename()+File.separator+"files.xml"),owner); } ! public static void add(FrostIndex a, File b, String owner){ add(a.getFilesMap(),b,owner); } ! protected static void add(Map chunk, File target, String owner) { --- 349,357 ---- add(a.getFilesMap(),new File(MainFrame.keypool+b.getBoardFilename()+File.separator+"files.xml"),owner); } ! private static void add(FrostIndex a, File b, String owner){ add(a.getFilesMap(),b,owner); } ! private static void add(Map chunk, File target, String owner) { |
From: Jose M. A. <kev...@us...> - 2004-05-30 10:31:51
|
Update of /cvsroot/jtcfrost/frost-wot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27057 Modified Files: build.xml Log Message: Changed: build script modified to add the hsqldbmin.jar to the compilation classpath and to prevent it from going into the distribution until it is really used. Index: build.xml =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/build.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** build.xml 1 Mar 2004 19:10:34 -0000 1.25 --- build.xml 30 May 2004 10:31:39 -0000 1.26 *************** *** 62,65 **** --- 62,66 ---- <pathelement location="${lib.dir}/mailapi.jar"/> <pathelement location="${lib.dir}/smtp.jar"/> + <pathelement location="${lib.dir}/hsqldbmin.jar"/> <pathelement location="${lib.dir}/jnlp.jar"/> <pathelement location="${build.classes.feclib}"/> *************** *** 256,259 **** --- 257,261 ---- <include name="*.jar"/> <exclude name="jnlp.jar"/> + <exclude name="hsqldbmin.jar"/> <!-- Not until it is used --> </fileset> </copy> |
From: Jose M. A. <kev...@us...> - 2004-05-30 07:58:33
|
Update of /cvsroot/jtcfrost/frost-wot/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/lib Added Files: hsqldbmin.jar Log Message: Initial version: hsqldb database. Version 1.7.1. Compiled for jdk 1.4. Minimal version. --- NEW FILE: hsqldbmin.jar --- (This appears to be a binary file; contents omitted.) |
From: Jose M. A. <kev...@us...> - 2004-05-29 04:06:45
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19370/source/frost Modified Files: MainFrame.java Log Message: Removed: getLanguageResource method (no longer used) Index: MainFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/MainFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MainFrame.java 27 May 2004 10:46:33 -0000 1.3 --- MainFrame.java 29 May 2004 04:06:35 -0000 1.4 *************** *** 2348,2358 **** } /** - * Getter for the language resource bundle - */ - public ResourceBundle getLanguageResource() { - return languageResource.getResourceBundle(); - } - - /** * */ --- 2348,2351 ---- |
Update of /cvsroot/jtcfrost/frost-wot/source/frost/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/gui Modified Files: Tag: swt-gui-branch AboutBox.java BoardInfoFrame.java BoardSettingsFrame.java HelpFrame.java KnownBoardsFrame.java MessageFrame.java MessageTable.java MessageUploadFailedDialog.java NewBoardDialog.java OptionsFrame.java SortedTable.java Splashscreen.java TofTree.java TofTreeXmlIO.java Log Message: its crippled but almost compiles Index: TofTreeXmlIO.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/TofTreeXmlIO.java,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** TofTreeXmlIO.java 26 May 2004 17:16:07 -0000 1.17 --- TofTreeXmlIO.java 29 May 2004 01:01:18 -0000 1.17.2.1 *************** *** 22,27 **** import java.util.logging.*; ! import javax.swing.JTree; ! import javax.swing.tree.*; import org.w3c.dom.*; --- 22,27 ---- import java.util.logging.*; ! import swingwtx.swing.JTree; ! import swingwtx.swing.tree.*; import org.w3c.dom.*; *************** *** 102,106 **** refreshModel( model, treeRootNode ); ! tree.updateUI(); logger.info("Board tree loaded successfully."); --- 102,106 ---- refreshModel( model, treeRootNode ); ! tree.repaint(); logger.info("Board tree loaded successfully."); *************** *** 480,484 **** boolean expanded; String expandedstr; ! expanded = tree.isExpanded( new TreePath(model.getPathToRoot(board)) ); if( expanded ) expandedstr = "true"; --- 480,485 ---- boolean expanded; String expandedstr; ! /*expanded = tree.isExpanded( new TreePath(model.getPathToRoot(board)) ); ! if( expanded ) expandedstr = "true"; *************** *** 486,490 **** expandedstr = "false"; ! rootBoardElement.setAttribute("isexpanded", expandedstr); // <name> Element element = doc.createElement("name"); --- 487,491 ---- expandedstr = "false"; ! rootBoardElement.setAttribute("isexpanded", expandedstr);*/ // <name> Element element = doc.createElement("name"); Index: NewBoardDialog.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/NewBoardDialog.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** NewBoardDialog.java 26 May 2004 13:17:00 -0000 1.4 --- NewBoardDialog.java 29 May 2004 01:01:17 -0000 1.4.2.1 *************** *** 7,16 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; ! import javax.swing.*; ! import javax.swing.border.EmptyBorder; ! import javax.swing.event.*; import frost.util.gui.translation.UpdatingLanguageResource; --- 7,16 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; ! import swingwtx.swing.*; ! import swingwtx.swing.border.EmptyBorder; ! import swingwtx.swing.event.*; import frost.util.gui.translation.UpdatingLanguageResource; *************** *** 33,37 **** /* (non-Javadoc) ! * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) */ public void changedUpdate(DocumentEvent e) { --- 33,37 ---- /* (non-Javadoc) ! * @see swingwtx.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) */ public void changedUpdate(DocumentEvent e) { *************** *** 42,46 **** /* (non-Javadoc) ! * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) */ public void insertUpdate(DocumentEvent e) { --- 42,46 ---- /* (non-Javadoc) ! * @see swingwtx.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) */ public void insertUpdate(DocumentEvent e) { *************** *** 51,55 **** /* (non-Javadoc) ! * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) */ public void removeUpdate(DocumentEvent e) { --- 51,55 ---- /* (non-Javadoc) ! * @see swingwtx.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) */ public void removeUpdate(DocumentEvent e) { *************** *** 60,64 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 60,64 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 96,100 **** /** ! * @throws java.awt.HeadlessException */ public NewBoardDialog(Frame owner, UpdatingLanguageResource languageResource) throws HeadlessException { --- 96,100 ---- /** ! * @throws swingwt.awt.HeadlessException */ public NewBoardDialog(Frame owner, UpdatingLanguageResource languageResource) throws HeadlessException { Index: BoardInfoFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/BoardInfoFrame.java,v retrieving revision 1.35 retrieving revision 1.35.2.1 diff -C2 -d -r1.35 -r1.35.2.1 *** BoardInfoFrame.java 22 May 2004 02:53:43 -0000 1.35 --- BoardInfoFrame.java 29 May 2004 01:01:17 -0000 1.35.2.1 *************** *** 19,32 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.io.File; import java.util.Vector; import java.util.logging.*; ! import javax.swing.*; ! import javax.swing.border.*; ! import javax.swing.event.*; ! import javax.swing.table.DefaultTableCellRenderer; import frost.*; --- 19,32 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.io.File; import java.util.Vector; import java.util.logging.*; ! import swingwtx.swing.*; ! import swingwtx.swing.border.*; ! import swingwtx.swing.event.*; ! import swingwtx.swing.table.DefaultTableCellRenderer; import frost.*; *************** *** 52,56 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) */ public void mouseClicked(MouseEvent e) { --- 52,56 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) */ public void mouseClicked(MouseEvent e) { *************** *** 61,65 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) */ public void mouseEntered(MouseEvent e) { --- 61,65 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) */ public void mouseEntered(MouseEvent e) { *************** *** 68,72 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) */ public void mouseExited(MouseEvent e) { --- 68,72 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) */ public void mouseExited(MouseEvent e) { *************** *** 75,79 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ public void mousePressed(MouseEvent e) { --- 75,79 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ public void mousePressed(MouseEvent e) { *************** *** 82,86 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { --- 82,86 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { *************** *** 154,158 **** refreshLanguage(); parent = p; ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); --- 154,158 ---- refreshLanguage(); parent = p; ! // enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); *************** *** 182,187 **** BoardInfoTableCellRenderer cellRenderer = new BoardInfoTableCellRenderer(); ! boardTable.setDefaultRenderer( Object.class, cellRenderer ); ! boardTable.setDefaultRenderer( Number.class, cellRenderer ); updateSelectedBoardButton.setEnabled(false); --- 182,187 ---- BoardInfoTableCellRenderer cellRenderer = new BoardInfoTableCellRenderer(); ! // boardTable.setDefaultRenderer( Object.class, cellRenderer ); ! // boardTable.setDefaultRenderer( Number.class, cellRenderer ); updateSelectedBoardButton.setEnabled(false); *************** *** 196,200 **** // updateButton ! ActionListener al = new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { updateButton_actionPerformed(e); --- 196,200 ---- // updateButton ! ActionListener al = new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { updateButton_actionPerformed(e); *************** *** 204,208 **** // updateSelectedBoardButton ! al = new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { updateSelectedBoardButton_actionPerformed(e); --- 204,208 ---- // updateSelectedBoardButton ! al = new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { updateSelectedBoardButton_actionPerformed(e); *************** *** 212,216 **** // updateAllBoardsButton ! al = new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { updateAllBoardsButton_actionPerformed(e); --- 212,216 ---- // updateAllBoardsButton ! al = new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { updateAllBoardsButton_actionPerformed(e); *************** *** 220,224 **** // Bclose ! al = new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { closeDialog(); --- 220,224 ---- // Bclose ! al = new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { closeDialog(); Index: SortedTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/SortedTable.java,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** SortedTable.java 4 May 2004 01:57:23 -0000 1.14 --- SortedTable.java 29 May 2004 01:01:18 -0000 1.14.2.1 *************** *** 19,27 **** package frost.gui; ! import java.awt.event.*; import java.util.*; ! import javax.swing.JTable; ! import javax.swing.table.*; import frost.gui.model.SortedTableModel; --- 19,27 ---- package frost.gui; ! import swingwt.awt.event.*; import java.util.*; ! import swingwtx.swing.JTable; ! import swingwtx.swing.table.*; import frost.gui.model.SortedTableModel; *************** *** 32,36 **** protected boolean sortedColumnAscending = true; ! private SortHeaderRenderer columnHeadersRenderer = new SortHeaderRenderer(); public SortedTable(SortedTableModel model) --- 32,36 ---- protected boolean sortedColumnAscending = true; ! //private SortHeaderRenderer columnHeadersRenderer = new SortHeaderRenderer(); public SortedTable(SortedTableModel model) *************** *** 125,133 **** */ protected void initSortHeader() { ! Enumeration enumeration = getColumnModel().getColumns(); while (enumeration.hasMoreElements()) { TableColumn column = (TableColumn) enumeration.nextElement(); column.setHeaderRenderer(columnHeadersRenderer); ! } getTableHeader().addMouseListener(new HeaderMouseListener()); } --- 125,133 ---- */ protected void initSortHeader() { ! /*Enumeration enumeration = getColumnModel().getColumns(); while (enumeration.hasMoreElements()) { TableColumn column = (TableColumn) enumeration.nextElement(); column.setHeaderRenderer(columnHeadersRenderer); ! }*/ getTableHeader().addMouseListener(new HeaderMouseListener()); } Index: OptionsFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/OptionsFrame.java,v retrieving revision 1.80 retrieving revision 1.80.2.1 diff -C2 -d -r1.80 -r1.80.2.1 *** OptionsFrame.java 22 May 2004 02:46:51 -0000 1.80 --- OptionsFrame.java 29 May 2004 01:01:17 -0000 1.80.2.1 *************** *** 25,37 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.io.*; import java.util.*; import java.util.logging.*; ! import javax.swing.*; ! import javax.swing.border.EmptyBorder; ! import javax.swing.event.*; import frost.*; --- 25,37 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.io.*; import java.util.*; import java.util.logging.*; ! import swingwtx.swing.*; ! import swingwtx.swing.border.EmptyBorder; ! import swingwtx.swing.event.*; import frost.*; *************** *** 57,61 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 57,61 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 337,341 **** /* (non-Javadoc) ! * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) */ public void stateChanged(ChangeEvent e) { --- 337,341 ---- /* (non-Javadoc) ! * @see swingwtx.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) */ public void stateChanged(ChangeEvent e) { *************** *** 346,350 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 346,350 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 840,844 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 840,844 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 1017,1021 **** /* (non-Javadoc) ! * @see java.awt.Component#setEnabled(boolean) */ public void setEnabled(boolean enabled) { --- 1017,1021 ---- /* (non-Javadoc) ! * @see swingwt.awt.Component#setEnabled(boolean) */ public void setEnabled(boolean enabled) { *************** *** 1079,1083 **** /* (non-Javadoc) ! * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) */ public void stateChanged(ChangeEvent e) { --- 1079,1083 ---- /* (non-Javadoc) ! * @see swingwtx.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) */ public void stateChanged(ChangeEvent e) { *************** *** 1092,1096 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 1092,1096 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 1457,1461 **** /* (non-Javadoc) ! * @see java.awt.Component#setEnabled(boolean) */ public void setEnabled(boolean enabled) { --- 1457,1461 ---- /* (non-Javadoc) ! * @see swingwt.awt.Component#setEnabled(boolean) */ public void setEnabled(boolean enabled) { *************** *** 1485,1489 **** } /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 1485,1489 ---- } /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 1502,1506 **** private Listener listener = new Listener(); ! private SkinChooser skinChooser = null; private JLabel moreSkinsLabel = new JLabel(); private JLabel fontsLabel = new JLabel(); --- 1502,1506 ---- private Listener listener = new Listener(); ! // private SkinChooser skinChooser = null; private JLabel moreSkinsLabel = new JLabel(); private JLabel fontsLabel = new JLabel(); *************** *** 1551,1556 **** constraints.gridx = 0; constraints.gridy = 0; ! skinChooser = new SkinChooser(languageResource.getResourceBundle()); ! add(skinChooser, constraints); constraints.insets = inset1515; --- 1551,1556 ---- constraints.gridx = 0; constraints.gridy = 0; ! /* skinChooser = new SkinChooser(languageResource.getResourceBundle()); ! add(skinChooser, constraints);*/ constraints.insets = inset1515; *************** *** 1650,1660 **** messageBodyLabel.setText(languageResource.getString("Message Body")); messageBodyButton.setText(languageResource.getString("Choose")); ! selectedMessageBodyFontLabel.setText(getFontLabel(selectedBodyFont)); messageListLabel.setText(languageResource.getString("Message List")); messageListButton.setText(languageResource.getString("Choose")); ! selectedMessageListFontLabel.setText(getFontLabel(selectedMessageListFont)); fileListLabel.setText(languageResource.getString("File List")); fileListButton.setText(languageResource.getString("Choose")); ! selectedFileListFontLabel.setText(getFontLabel(selectedFileListFont)); messageBodyAACheckBox.setText(languageResource.getString("EnableMessageBodyAA")); } --- 1650,1660 ---- messageBodyLabel.setText(languageResource.getString("Message Body")); messageBodyButton.setText(languageResource.getString("Choose")); ! // selectedMessageBodyFontLabel.setText(getFontLabel(selectedBodyFont)); messageListLabel.setText(languageResource.getString("Message List")); messageListButton.setText(languageResource.getString("Choose")); ! // selectedMessageListFontLabel.setText(getFontLabel(selectedMessageListFont)); fileListLabel.setText(languageResource.getString("File List")); fileListButton.setText(languageResource.getString("Choose")); ! // selectedFileListFontLabel.setText(getFontLabel(selectedFileListFont)); messageBodyAACheckBox.setText(languageResource.getString("EnableMessageBodyAA")); } *************** *** 1664,1669 **** * @return */ ! private String getFontLabel(Font font) { ! if (font == null) { return ""; } else { --- 1664,1669 ---- * @return */ ! /* private String getFontLabel(Font font) { ! /* if (font == null) { return ""; } else { *************** *** 1679,1691 **** return returnValue.toString(); } ! } public void ok() { ! skinChooser.commitChanges(); saveSettings(frostSettings); } public void cancel() { ! skinChooser.cancelChanges(); } --- 1679,1691 ---- return returnValue.toString(); } ! }*/ public void ok() { ! // skinChooser.commitChanges(); saveSettings(frostSettings); } public void cancel() { ! //skinChooser.cancelChanges(); } *************** *** 1695,1699 **** */ private void saveSettings(SettingsClass displaySettings) { ! boolean skinsEnabled = skinChooser.isSkinsEnabled(); displaySettings.setValue("skinsEnabled", skinsEnabled); --- 1695,1699 ---- */ private void saveSettings(SettingsClass displaySettings) { ! /* boolean skinsEnabled = skinChooser.isSkinsEnabled(); displaySettings.setValue("skinsEnabled", skinsEnabled); *************** *** 1719,1723 **** displaySettings.setValue(SettingsClass.FILE_LIST_FONT_SIZE, selectedFileListFont.getSize()); } ! displaySettings.setValue("messageBodyAA", messageBodyAACheckBox.isSelected()); } --- 1719,1723 ---- displaySettings.setValue(SettingsClass.FILE_LIST_FONT_SIZE, selectedFileListFont.getSize()); } ! displaySettings.setValue("messageBodyAA", messageBodyAACheckBox.isSelected());*/ } *************** *** 1727,1731 **** */ public void loadSettings(SettingsClass displaySettings) { ! boolean skinsEnabled = displaySettings.getBoolValue("skinsEnabled"); skinChooser.setSkinsEnabled(skinsEnabled); String selectedSkinPath = displaySettings.getValue("selectedSkin"); --- 1727,1731 ---- */ public void loadSettings(SettingsClass displaySettings) { ! /* boolean skinsEnabled = displaySettings.getBoolValue("skinsEnabled"); skinChooser.setSkinsEnabled(skinsEnabled); String selectedSkinPath = displaySettings.getValue("selectedSkin"); *************** *** 1750,1754 **** selectedFileListFontLabel.setText(getFontLabel(selectedFileListFont)); ! messageBodyAACheckBox.setSelected(displaySettings.getBoolValue("messageBodyAA")); } --- 1750,1754 ---- selectedFileListFontLabel.setText(getFontLabel(selectedFileListFont)); ! messageBodyAACheckBox.setSelected(displaySettings.getBoolValue("messageBodyAA"));*/ } *************** *** 1757,1761 **** */ private void messageBodyButtonPressed() { ! FontChooser fontChooser = new FontChooser(OptionsFrame.this, languageResource); fontChooser.setModal(true); fontChooser.setSelectedFont(selectedBodyFont); --- 1757,1761 ---- */ private void messageBodyButtonPressed() { ! /* FontChooser fontChooser = new FontChooser(OptionsFrame.this, languageResource); fontChooser.setModal(true); fontChooser.setSelectedFont(selectedBodyFont); *************** *** 1765,1769 **** selectedBodyFont = selectedFontTemp; selectedMessageBodyFontLabel.setText(getFontLabel(selectedBodyFont)); ! } } --- 1765,1769 ---- selectedBodyFont = selectedFontTemp; selectedMessageBodyFontLabel.setText(getFontLabel(selectedBodyFont)); ! }*/ } *************** *** 1772,1776 **** */ private void messageListButtonPressed() { ! FontChooser fontChooser = new FontChooser(OptionsFrame.this, languageResource); fontChooser.setModal(true); fontChooser.setSelectedFont(selectedMessageListFont); --- 1772,1776 ---- */ private void messageListButtonPressed() { ! /*FontChooser fontChooser = new FontChooser(OptionsFrame.this, languageResource); fontChooser.setModal(true); fontChooser.setSelectedFont(selectedMessageListFont); *************** *** 1780,1784 **** selectedMessageListFont = selectedFontTemp; selectedMessageListFontLabel.setText(getFontLabel(selectedMessageListFont)); ! } } --- 1780,1784 ---- selectedMessageListFont = selectedFontTemp; selectedMessageListFontLabel.setText(getFontLabel(selectedMessageListFont)); ! }*/ } *************** *** 1787,1791 **** */ private void fileListButtonPressed() { ! FontChooser fontChooser = new FontChooser(OptionsFrame.this, languageResource); fontChooser.setModal(true); fontChooser.setSelectedFont(selectedFileListFont); --- 1787,1791 ---- */ private void fileListButtonPressed() { ! /* FontChooser fontChooser = new FontChooser(OptionsFrame.this, languageResource); fontChooser.setModal(true); fontChooser.setSelectedFont(selectedFileListFont); *************** *** 1795,1799 **** selectedFileListFont = selectedFontTemp; selectedFileListFontLabel.setText(getFontLabel(selectedFileListFont)); ! } } --- 1795,1799 ---- selectedFileListFont = selectedFontTemp; selectedFileListFontLabel.setText(getFontLabel(selectedFileListFont)); ! }*/ } *************** *** 1826,1830 **** JPanel optionsGroupsPanel = null; ! AntialiasedTextArea tofTextArea = new AntialiasedTextArea(4, 50); JTextField tofUploadHtlTextField = new JTextField(5); --- 1826,1830 ---- JPanel optionsGroupsPanel = null; ! TextArea tofTextArea = new TextArea(4, 50); JTextField tofUploadHtlTextField = new JTextField(5); *************** *** 2025,2029 **** int fontSize = frostSettings.getIntValue(SettingsClass.MESSAGE_BODY_FONT_SIZE); Font tofFont = new Font(fontName, fontStyle, fontSize); ! if (!tofFont.getFamily().equals(fontName)) { logger.severe("The selected font was not found in your system\n" + "That selection will be changed to \"Monospaced\"."); --- 2025,2029 ---- int fontSize = frostSettings.getIntValue(SettingsClass.MESSAGE_BODY_FONT_SIZE); Font tofFont = new Font(fontName, fontStyle, fontSize); ! /* if (!tofFont.getFamily().equals(fontName)) { logger.severe("The selected font was not found in your system\n" + "That selection will be changed to \"Monospaced\"."); *************** *** 2031,2036 **** tofFont = new Font("Monospaced", fontStyle, fontSize); } ! tofTextArea.setFont(tofFont); ! tofTextArea.setAntiAliasEnabled(frostSettings.getBoolValue("messageBodyAA")); //Build the panel --- 2031,2036 ---- tofFont = new Font("Monospaced", fontStyle, fontSize); } ! tofTextArea.setFont(tofFont);*/ ! // tofTextArea.setAntiAliasEnabled(frostSettings.getBoolValue("messageBodyAA")); //Build the panel *************** *** 2263,2267 **** JButton cancelButton = new JButton(languageResource.getString("Cancel")); ! okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { okButton_actionPerformed(e); --- 2263,2267 ---- JButton cancelButton = new JButton(languageResource.getString("Cancel")); ! okButton.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { okButton_actionPerformed(e); *************** *** 2269,2273 **** }); cancelButton ! .addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { cancelButton_actionPerformed(e); --- 2269,2273 ---- }); cancelButton ! .addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { cancelButton_actionPerformed(e); *************** *** 2585,2589 **** loadSignature(); ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); --- 2585,2589 ---- loadSignature(); ! //enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); Index: BoardSettingsFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/BoardSettingsFrame.java,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -C2 -d -r1.25 -r1.25.2.1 *** BoardSettingsFrame.java 27 May 2004 10:48:09 -0000 1.25 --- BoardSettingsFrame.java 29 May 2004 01:01:17 -0000 1.25.2.1 *************** *** 20,31 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.io.IOException; import java.util.ResourceBundle; import java.util.logging.Logger; ! import javax.swing.*; ! import javax.swing.border.*; import frost.MainFrame; --- 20,31 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.io.IOException; import java.util.ResourceBundle; import java.util.logging.Logger; ! import swingwtx.swing.*; ! import swingwtx.swing.border.*; import frost.MainFrame; *************** *** 50,54 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 50,54 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 142,146 **** this.languageResource = languageResource; setModal(true); ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); initialize(); pack(); --- 142,146 ---- this.languageResource = languageResource; setModal(true); ! //enableEvents(AWTEvent.WINDOW_EVENT_MASK); initialize(); pack(); Index: Splashscreen.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/Splashscreen.java,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** Splashscreen.java 5 May 2004 04:35:16 -0000 1.11 --- Splashscreen.java 29 May 2004 01:01:18 -0000 1.11.2.1 *************** *** 19,27 **** package frost.gui; ! import java.awt.*; import java.io.File; import java.util.logging.Logger; ! import javax.swing.*; /** --- 19,27 ---- package frost.gui; ! import swingwt.awt.*; import java.io.File; import java.util.logging.Logger; ! import swingwtx.swing.*; /** *************** *** 30,37 **** * Problem with JProgressBar: a user reported having problems when starting Frost. He was getting this stack trace: * Exception in thread "main" java.lang.NullPointerException ! * at java.awt.Dimension.<init>(Unknown Source) ! * at javax.swing.plaf.basic.BasicProgressBarUI.getPreferredSize(Unknown Source) * [..] ! * at java.awt.Window.pack(Unknown Source) * at frost.gui.Splashscreen.init(Splashscreen.java:66) * [..] --- 30,37 ---- * Problem with JProgressBar: a user reported having problems when starting Frost. He was getting this stack trace: * Exception in thread "main" java.lang.NullPointerException ! * at swingwt.awt.Dimension.<init>(Unknown Source) ! * at swingwtx.swing.plaf.basic.BasicProgressBarUI.getPreferredSize(Unknown Source) * [..] ! * at swingwt.awt.Window.pack(Unknown Source) * at frost.gui.Splashscreen.init(Splashscreen.java:66) * [..] *************** *** 85,89 **** private void init() { ! setUndecorated(true); setResizable(false); --- 85,89 ---- private void init() { ! //setUndecorated(true); setResizable(false); *************** *** 130,134 **** /* (non-Javadoc) ! * @see java.awt.Component#setVisible(boolean) */ public void setVisible(boolean b) { --- 130,134 ---- /* (non-Javadoc) ! * @see swingwt.awt.Component#setVisible(boolean) */ public void setVisible(boolean b) { Index: HelpFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/HelpFrame.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** HelpFrame.java 22 May 2004 02:53:43 -0000 1.4 --- HelpFrame.java 29 May 2004 01:01:17 -0000 1.4.2.1 *************** *** 20,29 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.io.File; import java.util.logging.*; ! import javax.swing.*; import frost.*; --- 20,29 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.io.File; import java.util.logging.*; ! import swingwtx.swing.*; import frost.*; *************** *** 70,74 **** // Actionlistener //------------------------------------------------------------------------ ! comboBox.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { textArea.setText(FileAccess.readFile("help/" + (String)comboBox.getSelectedItem() + ".txt")); --- 70,74 ---- // Actionlistener //------------------------------------------------------------------------ ! comboBox.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { textArea.setText(FileAccess.readFile("help/" + (String)comboBox.getSelectedItem() + ".txt")); *************** *** 103,107 **** public HelpFrame(JFrame parent) { super(); ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); --- 103,107 ---- public HelpFrame(JFrame parent) { super(); ! // enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); Index: MessageTable.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/MessageTable.java,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** MessageTable.java 5 Apr 2004 15:39:08 -0000 1.11 --- MessageTable.java 29 May 2004 01:01:17 -0000 1.11.2.1 *************** *** 19,26 **** package frost.gui; ! import java.awt.*; ! import javax.swing.JTable; ! import javax.swing.table.DefaultTableCellRenderer; import frost.gui.model.MessageTableModel; --- 19,26 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwtx.swing.JTable; ! import swingwtx.swing.table.DefaultTableCellRenderer; import frost.gui.model.MessageTableModel; *************** *** 29,38 **** public class MessageTable extends SortedTable { ! private CellRenderer cellRenderer = new CellRenderer(); public MessageTable(MessageTableModel m) { super(m); ! setDefaultRenderer(Object.class, cellRenderer); // default for messages: sort by date descending --- 29,39 ---- public class MessageTable extends SortedTable { ! //private CellRenderer cellRenderer = new CellRenderer(); public MessageTable(MessageTableModel m) { super(m); ! // setRenderer(Object.class, cellRenderer); ! // default for messages: sort by date descending *************** *** 45,49 **** * This renderer renders rows in different colors. * New messages gets a bold look, messages with attachments a blue color. ! */ private class CellRenderer extends DefaultTableCellRenderer { --- 46,50 ---- * This renderer renders rows in different colors. * New messages gets a bold look, messages with attachments a blue color. ! *//* private class CellRenderer extends DefaultTableCellRenderer { *************** *** 94,100 **** return this; } ! /* (non-Javadoc) ! * @see java.awt.Component#setFont(java.awt.Font) ! */ public void setFont(Font font) { super.setFont(font); --- 95,99 ---- return this; } ! public void setFont(Font font) { super.setFont(font); *************** *** 103,112 **** } ! } /* (non-Javadoc) ! * @see javax.swing.JTable#createDefaultColumnsFromModel() */ public void createDefaultColumnsFromModel() { ! super.createDefaultColumnsFromModel(); // set column sizes --- 102,111 ---- } ! }*/ /* (non-Javadoc) ! * @see swingwtx.swing.JTable#createDefaultColumnsFromModel() */ public void createDefaultColumnsFromModel() { ! //super.createDefaultColumnsFromModel(); // set column sizes *************** *** 118,128 **** /* (non-Javadoc) ! * @see java.awt.Component#setFont(java.awt.Font) */ public void setFont(Font font) { ! super.setFont(font); if (cellRenderer != null) { cellRenderer.setFont(font); ! } setRowHeight(font.getSize() + 5); } --- 117,127 ---- /* (non-Javadoc) ! * @see swingwt.awt.Component#setFont(java.awt.Font) */ public void setFont(Font font) { ! /* super.setFont(font); if (cellRenderer != null) { cellRenderer.setFont(font); ! }*/ setRowHeight(font.getSize() + 5); } Index: TofTree.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/TofTree.java,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -C2 -d -r1.31 -r1.31.2.1 *** TofTree.java 26 May 2004 11:49:00 -0000 1.31 --- TofTree.java 29 May 2004 01:01:18 -0000 1.31.2.1 *************** *** 19,42 **** package frost.gui; ! import java.awt.*; ! import java.awt.datatransfer.*; ! import java.awt.dnd.*; ! import java.awt.event.*; ! import java.awt.geom.*; ! import java.awt.image.BufferedImage; import java.io.*; import java.util.*; import java.util.logging.*; ! import javax.swing.*; ! import javax.swing.tree.*; import frost.*; import frost.gui.objects.FrostBoardObject; import frost.threads.maintenance.Savable; - import frost.util.gui.JDragTree; import frost.util.gui.translation.UpdatingLanguageResource; ! public class TofTree extends JDragTree implements Savable { /** --- 19,43 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.datatransfer.*; ! import swingwt.awt.dnd.*; ! import swingwt.awt.event.*; ! import swingwt.awt.geom.*; ! import swingwt.awt.image.BufferedImage; import java.io.*; import java.util.*; import java.util.logging.*; ! import org.eclipse.swt.widgets.Tree; ! ! import swingwtx.swing.*; ! import swingwtx.swing.tree.*; import frost.*; import frost.gui.objects.FrostBoardObject; import frost.threads.maintenance.Savable; import frost.util.gui.translation.UpdatingLanguageResource; ! public class TofTree extends JTree implements Savable { /** *************** *** 69,76 **** readAccessIcon = new ImageIcon(MainFrame.class.getResource("/data/raboard.jpg")); readAccessNewIcon = new ImageIcon(MainFrame.class.getResource("/data/raboardnew.jpg")); ! this.setLeafIcon(new ImageIcon(MainFrame.class.getResource("/data/board.gif"))); ! this.setClosedIcon(new ImageIcon(MainFrame.class.getResource("/data/closed.gif"))); ! this.setOpenIcon(new ImageIcon(MainFrame.class.getResource("/data/open.gif"))); ! JTable dummyTable = new JTable(); normalFont = dummyTable.getFont(); --- 70,77 ---- readAccessIcon = new ImageIcon(MainFrame.class.getResource("/data/raboard.jpg")); readAccessNewIcon = new ImageIcon(MainFrame.class.getResource("/data/raboardnew.jpg")); ! //this.setLeafIcon(new ImageIcon(MainFrame.class.getResource("/data/board.gif"))); ! //this.setClosedIcon(new ImageIcon(MainFrame.class.getResource("/data/closed.gif"))); ! //this.setOpenIcon(new ImageIcon(MainFrame.class.getResource("/data/open.gif"))); ! JTable dummyTable = new JTable(); normalFont = dummyTable.getFont(); *************** *** 131,147 **** (Color) MainFrame.frostSettings.getObjectValue( "boardUpdatingNonSelectedBackgroundColor"); ! setBackgroundNonSelectionColor(c); ! c = (Color) MainFrame.frostSettings.getObjectValue( "boardUpdatingSelectedBackgroundColor"); ! setBackgroundSelectionColor(c); } else { // refresh colours from the L&F ! setTextSelectionColor(UIManager.getColor("Tree.selectionForeground")); ! setTextNonSelectionColor(UIManager.getColor("Tree.textForeground")); ! setBackgroundNonSelectionColor(UIManager.getColor("Tree.textBackground")); ! setBackgroundSelectionColor(UIManager.getColor("Tree.selectionBackground")); } --- 132,148 ---- (Color) MainFrame.frostSettings.getObjectValue( "boardUpdatingNonSelectedBackgroundColor"); ! //setBackgroundNonSelectionColor(c); ! c = (Color) MainFrame.frostSettings.getObjectValue( "boardUpdatingSelectedBackgroundColor"); ! //setBackgroundSelectionColor(c); } else { // refresh colours from the L&F ! //setTextSelectionColor(UIManager.getColor("Tree.selectionForeground")); ! //setTextNonSelectionColor(UIManager.getColor("Tree.textForeground")); ! //setBackgroundNonSelectionColor(UIManager.getColor("Tree.textBackground")); ! //setBackgroundSelectionColor(UIManager.getColor("Tree.selectionBackground")); } *************** *** 251,265 **** { FrostBoardObject node = (FrostBoardObject)this.getModel().getRoot(); ! Vector boards = new Vector(); ! Enumeration e = node.depthFirstEnumeration(); ! while( e.hasMoreElements() ) { ! FrostBoardObject child = (FrostBoardObject)e.nextElement(); ! if( child.isFolder() == false ) ! { ! boards.add( child ); } } ! return boards; } --- 252,271 ---- { FrostBoardObject node = (FrostBoardObject)this.getModel().getRoot(); ! return getAllBoardsRec(node); ! } ! ! private Vector getAllBoardsRec(FrostBoardObject node) { ! Vector ret = new Vector(); ! int children = this.getModel().getChildCount(node); ! for (int i =0;i<children;i++) { ! FrostBoardObject child = (FrostBoardObject)getModel().getChild(node,i); ! if( child.isLeaf()){ ! if (child.isFolder() == false ) ! ret.add( child ); } + else ret.addAll(getAllBoardsRec(child)); } ! return ret; } *************** *** 273,277 **** FrostBoardObject node = (FrostBoardObject) this.getModel().getRoot(); Vector boards = new Vector(); ! Enumeration e = node.depthFirstEnumeration(); while (e.hasMoreElements()) { FrostBoardObject child = (FrostBoardObject) e.nextElement(); --- 279,283 ---- FrostBoardObject node = (FrostBoardObject) this.getModel().getRoot(); Vector boards = new Vector(); ! Enumeration e = getAllBoardsRec(node).elements(); while (e.hasMoreElements()) { FrostBoardObject child = (FrostBoardObject) e.nextElement(); *************** *** 370,374 **** int answer = JOptionPane.showConfirmDialog( ! getTopLevelAncestor(), languageResource.getString("You already have a board with name") + " '" --- 376,380 ---- int answer = JOptionPane.showConfirmDialog( ! this.getParent(), languageResource.getString("You already have a board with name") + " '" *************** *** 474,478 **** if (node == null) { // nothing selected? unbelievable ! so select the root ... ! setSelectionRow(0); node = (FrostBoardObject) getModel().getRoot(); } --- 480,487 ---- if (node == null) { // nothing selected? unbelievable ! so select the root ... ! ! Tree swtTree = (Tree)getPeer(); ! swtTree.setSelection(new org.eclipse.swt.widgets.TreeItem[] ! {swtTree.getTopItem()}); node = (FrostBoardObject) getModel().getRoot(); } Index: KnownBoardsFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/KnownBoardsFrame.java,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** KnownBoardsFrame.java 26 May 2004 11:29:32 -0000 1.19 --- KnownBoardsFrame.java 29 May 2004 01:01:17 -0000 1.19.2.1 *************** *** 19,30 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.util.*; import java.util.logging.*; ! import javax.swing.*; ! import javax.swing.event.*; ! import javax.swing.table.*; import frost.*; --- 19,30 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.util.*; import java.util.logging.*; ! import swingwtx.swing.*; ! import swingwtx.swing.event.*; ! import swingwtx.swing.table.*; import frost.*; *************** *** 59,63 **** super(); KnownBoardsFrame.LangRes = LangRes; ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { init(); --- 59,63 ---- super(); KnownBoardsFrame.LangRes = LangRes; ! // enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { init(); *************** *** 117,125 **** boardsTableListModel_valueChanged(e); } }); ! BaddBoard.addActionListener( new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { addBoards_actionPerformed(e); } }); ! Bclose.addActionListener( new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { dispose(); --- 117,125 ---- boardsTableListModel_valueChanged(e); } }); ! BaddBoard.addActionListener( new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { addBoards_actionPerformed(e); } }); ! Bclose.addActionListener( new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { dispose(); *************** *** 157,165 **** JMenuItem removeBoardEntry = new JMenuItem(LangRes.getString("KnownBoardsFrame.Remove board")); ! addBoardsMenu.addActionListener( new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { addBoards_actionPerformed(e); } }); ! removeBoardEntry.addActionListener( new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { deleteBoards_actionPerformed(e); --- 157,165 ---- JMenuItem removeBoardEntry = new JMenuItem(LangRes.getString("KnownBoardsFrame.Remove board")); ! addBoardsMenu.addActionListener( new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { addBoards_actionPerformed(e); } }); ! removeBoardEntry.addActionListener( new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { deleteBoards_actionPerformed(e); *************** *** 355,359 **** // determine the count of showed rows ! int visibleRows = (int)(boardsTable.getVisibleRect().getHeight() / boardsTable.getCellRect(row,0,true).getHeight()); int scrollToRow; if( row + visibleRows > tableModel.getRowCount() ) --- 355,359 ---- // determine the count of showed rows ! /*int visibleRows = (int)(boardsTable.getVisibleRect().getHeight() / boardsTable.getCellRect(row,0,true).getHeight()); int scrollToRow; if( row + visibleRows > tableModel.getRowCount() ) *************** *** 368,372 **** // scroll 2 times to make sure row is displayed boardsTable.scrollRectToVisible(boardsTable.getCellRect(row,0,true)); ! boardsTable.scrollRectToVisible(boardsTable.getCellRect(scrollToRow,0,true)); break; } --- 368,372 ---- // scroll 2 times to make sure row is displayed boardsTable.scrollRectToVisible(boardsTable.getCellRect(row,0,true)); ! boardsTable.scrollRectToVisible(boardsTable.getCellRect(scrollToRow,0,true));*/ break; } Index: AboutBox.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/AboutBox.java,v retrieving revision 1.58 retrieving revision 1.58.2.1 diff -C2 -d -r1.58 -r1.58.2.1 *** AboutBox.java 27 Nov 2003 23:02:17 -0000 1.58 --- AboutBox.java 29 May 2004 01:01:17 -0000 1.58.2.1 *************** *** 19,27 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.util.ResourceBundle; ! import javax.swing.*; public class AboutBox extends JDialog implements ActionListener { --- 19,27 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.util.ResourceBundle; ! import swingwtx.swing.*; public class AboutBox extends JDialog implements ActionListener { *************** *** 59,63 **** super(parent); languageResource = newLanguageResource; ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); jbInit(); pack(); --- 59,63 ---- super(parent); languageResource = newLanguageResource; ! // enableEvents(AWTEvent.WINDOW_EVENT_MASK); jbInit(); pack(); Index: MessageFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/MessageFrame.java,v retrieving revision 1.62 retrieving revision 1.62.2.1 diff -C2 -d -r1.62 -r1.62.2.1 *** MessageFrame.java 26 May 2004 11:32:33 -0000 1.62 --- MessageFrame.java 29 May 2004 01:01:17 -0000 1.62.2.1 *************** *** 19,32 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; import java.io.File; import java.util.*; import java.util.logging.*; ! import javax.swing.*; ! import javax.swing.border.*; ! import javax.swing.event.*; ! import javax.swing.text.BadLocationException; import frost.*; --- 19,32 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.io.File; import java.util.*; import java.util.logging.*; ! import swingwtx.swing.*; ! import swingwtx.swing.border.*; ! import swingwtx.swing.event.*; ! import swingwtx.swing.text.BadLocationException; import frost.*; *************** *** 140,164 **** // Actionlistener //------------------------------------------------------------------------ ! Bsend.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { send_actionPerformed(e); } }); ! Bcancel.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { cancel_actionPerformed(e); } }); ! BattachFile.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { attachFile_actionPerformed(e); } }); ! BattachBoard.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { attachBoards_actionPerformed(e); } }); ! sign.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { sign_ActionPerformed(e); --- 140,164 ---- // Actionlistener //------------------------------------------------------------------------ ! Bsend.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { send_actionPerformed(e); } }); ! Bcancel.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { cancel_actionPerformed(e); } }); ! BattachFile.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { attachFile_actionPerformed(e); } }); ! BattachBoard.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { attachBoards_actionPerformed(e); } }); ! sign.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { sign_ActionPerformed(e); *************** *** 245,254 **** JMenuItem removeBoards = new JMenuItem(LangRes.getString("Remove")); ! removeFiles.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { removeSelectedItemsFromTable(attFilesTable); } }); ! removeBoards.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { removeSelectedItemsFromTable(attBoardsTable); --- 245,254 ---- JMenuItem removeBoards = new JMenuItem(LangRes.getString("Remove")); ! removeFiles.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { removeSelectedItemsFromTable(attFilesTable); } }); ! removeBoards.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { removeSelectedItemsFromTable(attBoardsTable); *************** *** 289,293 **** LangRes.getString("You must enter a subject!"), LangRes.getString("No subject specified!"), ! JOptionPane.ERROR); return; } --- 289,293 ---- LangRes.getString("You must enter a subject!"), LangRes.getString("No subject specified!"), ! JOptionPane.ERROR_MESSAGE); return; } *************** *** 297,301 **** LangRes.getString("You must enter a sender name!"), LangRes.getString("No 'From' specified!"), ! JOptionPane.ERROR); return; } --- 297,301 ---- LangRes.getString("You must enter a sender name!"), LangRes.getString("No 'From' specified!"), ! JOptionPane.ERROR_MESSAGE); return; } *************** *** 569,573 **** } ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); --- 569,573 ---- } ! //enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); *************** *** 601,605 **** // Properly positions the caret (AKA cursor) ! messageTextArea.requestFocusInWindow(); messageTextArea.getCaret().setDot(caretPos); messageTextArea.getCaret().setVisible(true); --- 601,605 ---- // Properly positions the caret (AKA cursor) ! messageTextArea.getPeer().forceFocus(); messageTextArea.getCaret().setDot(caretPos); messageTextArea.getCaret().setVisible(true); *************** *** 657,666 **** int fontSize = frostSettings.getIntValue(SettingsClass.MESSAGE_BODY_FONT_SIZE); Font tofFont = new Font(fontName, fontStyle, fontSize); ! if (!tofFont.getFamily().equals(fontName)) { logger.severe("The selected font was not found in your system\n" + "That selection will be changed to \"Monospaced\"."); frostSettings.setValue(SettingsClass.MESSAGE_BODY_FONT_NAME, "Monospaced"); tofFont = new Font("Monospaced", fontStyle, fontSize); ! } messageTextArea.setFont(tofFont); messageTextArea.setAntiAliasEnabled(frostSettings.getBoolValue("messageBodyAA")); --- 657,666 ---- int fontSize = frostSettings.getIntValue(SettingsClass.MESSAGE_BODY_FONT_SIZE); Font tofFont = new Font(fontName, fontStyle, fontSize); ! /*if (!tofFont.getFamily().equals(fontName)) { logger.severe("The selected font was not found in your system\n" + "That selection will be changed to \"Monospaced\"."); frostSettings.setValue(SettingsClass.MESSAGE_BODY_FONT_NAME, "Monospaced"); tofFont = new Font("Monospaced", fontStyle, fontSize); ! }*/ messageTextArea.setFont(tofFont); messageTextArea.setAntiAliasEnabled(frostSettings.getBoolValue("messageBodyAA")); Index: MessageUploadFailedDialog.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/gui/MessageUploadFailedDialog.java,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** MessageUploadFailedDialog.java 20 Jul 2003 16:15:39 -0000 1.3 --- MessageUploadFailedDialog.java 29 May 2004 01:01:17 -0000 1.3.4.1 *************** *** 21,29 **** package frost.gui; ! import java.awt.*; ! import java.awt.event.*; ! import javax.swing.*; ! import javax.swing.plaf.basic.BasicOptionPaneUI; public class MessageUploadFailedDialog extends JDialog --- 21,29 ---- package frost.gui; ! import swingwt.awt.*; ! import swingwt.awt.event.*; ! import swingwtx.swing.*; ! //import swingwtx.swing.plaf.basic.BasicOptionPaneUI; public class MessageUploadFailedDialog extends JDialog *************** *** 84,88 **** tryOnNextStartupButton.addActionListener( bl ); ! this.getContentPane().add(new JLabel(new IconFromUI().getIcon()), constr); constr.anchor = GridBagConstraints.CENTER; --- 84,88 ---- tryOnNextStartupButton.addActionListener( bl ); ! this.getContentPane().add(new JLabel("stub for some icon"), constr); constr.anchor = GridBagConstraints.CENTER; *************** *** 150,154 **** } } ! class IconFromUI extends BasicOptionPaneUI { public IconFromUI () --- 150,154 ---- } } ! /* class IconFromUI extends BasicOptionPaneUI { public IconFromUI () *************** *** 160,163 **** return super.getIconForType(JOptionPane.WARNING_MESSAGE); } ! } } --- 160,163 ---- return super.getIconForType(JOptionPane.WARNING_MESSAGE); } ! }*/ } |
From: Zlatin B. <zl...@us...> - 2004-05-29 01:02:02
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/components/translate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/components/translate Modified Files: Tag: swt-gui-branch TranslateFrame.java TranslatePanel.java TranslateTableModel.java TranslateTableSorter.java Log Message: its crippled but almost compiles Index: TranslatePanel.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/components/translate/TranslatePanel.java,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** TranslatePanel.java 15 Nov 2003 23:02:27 -0000 1.11 --- TranslatePanel.java 29 May 2004 01:01:13 -0000 1.11.2.1 *************** *** 20,31 **** package frost.components.translate; ! import java.awt.BorderLayout; ! import java.awt.event.ActionEvent; import java.io.File; import java.util.*; ! import javax.swing.*; ! //import javax.swing.event.*; ! //import javax.swing.table.*; /** --- 20,31 ---- package frost.components.translate; ! import swingwt.awt.BorderLayout; ! import swingwt.awt.event.ActionEvent; import java.io.File; import java.util.*; ! import swingwtx.swing.*; ! //import swingwtx.swing.event.*; ! //import swingwtx.swing.table.*; /** *************** *** 102,106 **** "1. Select the language you want to translate.\n2. Translate each row of the table.\n3. Save your translation\n4. Send us the saved 'LangRes_xx.java' file in your Frost directory\n or upload it with frost.\n\nThank you!", "Instructions", ! JOptionPane.PLAIN_MESSAGE); } --- 102,106 ---- "1. Select the language you want to translate.\n2. Translate each row of the table.\n3. Save your translation\n4. Send us the saved 'LangRes_xx.java' file in your Frost directory\n or upload it with frost.\n\nThank you!", "Instructions", ! JOptionPane.INFORMATION_MESSAGE); } *************** *** 153,158 **** */ private void generateComboBoxListeners() { ! comboBox.addItemListener(new java.awt.event.ItemListener() { ! public void itemStateChanged(java.awt.event.ItemEvent e) { configureTable((String) comboBox.getSelectedItem()); } --- 153,158 ---- */ private void generateComboBoxListeners() { ! comboBox.addItemListener(new swingwt.awt.event.ItemListener() { ! public void itemStateChanged(swingwt.awt.event.ItemEvent e) { configureTable((String) comboBox.getSelectedItem()); } *************** *** 173,177 **** */ private void generateButtonListeners() { ! saveButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { String languageCode = getSelectedLanguageCode(); --- 173,177 ---- */ private void generateButtonListeners() { ! saveButton.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { String languageCode = getSelectedLanguageCode(); *************** *** 187,191 **** } }); ! loadButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { loadLanguageFile(); --- 187,191 ---- } }); ! loadButton.addActionListener(new swingwt.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { loadLanguageFile(); Index: TranslateTableSorter.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/components/translate/TranslateTableSorter.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** TranslateTableSorter.java 31 Jan 2004 19:58:08 -0000 1.3 --- TranslateTableSorter.java 29 May 2004 01:01:13 -0000 1.3.2.1 *************** *** 19,28 **** package frost.components.translate; ! import java.awt.event.*; import java.util.*; import java.util.logging.*; ! import javax.swing.JTable; ! import javax.swing.table.*; /** --- 19,28 ---- package frost.components.translate; ! import swingwt.awt.event.*; import java.util.*; import java.util.logging.*; ! import swingwtx.swing.JTable; ! import swingwtx.swing.table.*; /** *************** *** 51,55 **** } } ! table.updateUI(); } --- 51,55 ---- } } ! table.repaint(); } Index: TranslateTableModel.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/components/translate/TranslateTableModel.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** TranslateTableModel.java 15 Nov 2003 23:02:28 -0000 1.2 --- TranslateTableModel.java 29 May 2004 01:01:13 -0000 1.2.2.1 *************** *** 20,24 **** package frost.components.translate; ! import javax.swing.table.DefaultTableModel; public class TranslateTableModel extends DefaultTableModel --- 20,24 ---- package frost.components.translate; ! import swingwtx.swing.table.DefaultTableModel; public class TranslateTableModel extends DefaultTableModel Index: TranslateFrame.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/components/translate/TranslateFrame.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** TranslateFrame.java 31 Jan 2004 19:58:08 -0000 1.5 --- TranslateFrame.java 29 May 2004 01:01:13 -0000 1.5.2.1 *************** *** 20,28 **** package frost.components.translate; ! import java.awt.*; ! import java.awt.event.WindowEvent; import java.util.logging.*; ! import javax.swing.JFrame; public class TranslateFrame extends JFrame { --- 20,28 ---- package frost.components.translate; ! import swingwt.awt.*; ! import swingwt.awt.event.WindowEvent; import java.util.logging.*; ! import swingwtx.swing.JFrame; public class TranslateFrame extends JFrame { *************** *** 61,65 **** this.plugin = plugin; ! enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); --- 61,65 ---- this.plugin = plugin; ! //enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { Init(); |
Update of /cvsroot/jtcfrost/frost-wot/lib/skinlfFix/com/l2fprod/gui/plaf/skin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/lib/skinlfFix/com/l2fprod/gui/plaf/skin Modified Files: Tag: swt-gui-branch SkinButtonUI.java SkinLookAndFeel.java SkinTableHeaderUI.java SkinToolBarSeparatorUI.java SkinUtils.java Log Message: its crippled but almost compiles Index: SkinTableHeaderUI.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/lib/skinlfFix/com/l2fprod/gui/plaf/skin/SkinTableHeaderUI.java,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** SkinTableHeaderUI.java 25 May 2004 23:43:41 -0000 1.6 --- SkinTableHeaderUI.java 29 May 2004 01:01:10 -0000 1.6.2.1 *************** *** 48,55 **** package com.l2fprod.gui.plaf.skin; ! import javax.swing.JComponent; ! import javax.swing.plaf.ComponentUI; ! import javax.swing.plaf.basic.BasicTableHeaderUI; ! import javax.swing.table.TableCellRenderer; /** --- 48,55 ---- package com.l2fprod.gui.plaf.skin; ! import swingwtx.swing.JComponent; ! import swingwtx.swing.plaf.ComponentUI; ! import swingwtx.swing.plaf.basic.BasicTableHeaderUI; ! import swingwtx.swing.table.TableCellRenderer; /** *************** *** 103,107 **** /* (non-Javadoc) ! * @see javax.swing.plaf.ComponentUI#uninstallUI(javax.swing.JComponent) */ public void uninstallUI(JComponent c) { --- 103,107 ---- /* (non-Javadoc) ! * @see swingwtx.swing.plaf.ComponentUI#uninstallUI(javax.swing.JComponent) */ public void uninstallUI(JComponent c) { Index: SkinLookAndFeel.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/lib/skinlfFix/com/l2fprod/gui/plaf/skin/SkinLookAndFeel.java,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** SkinLookAndFeel.java 25 May 2004 23:38:00 -0000 1.7 --- SkinLookAndFeel.java 29 May 2004 01:01:10 -0000 1.7.2.1 *************** *** 45,53 **** import com.l2fprod.util.ZipResourceLoader; ! import java.awt.Color; ! import java.awt.Dimension; ! import java.awt.Font; ! import java.awt.Insets; ! import java.awt.event.KeyEvent; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; --- 45,53 ---- import com.l2fprod.util.ZipResourceLoader; ! import swingwt.awt.Color; ! import swingwt.awt.Dimension; ! import swingwt.awt.Font; ! import swingwt.awt.Insets; ! import swingwt.awt.event.KeyEvent; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; *************** *** 59,80 **** import java.util.ResourceBundle; ! import javax.swing.BorderFactory; ! import javax.swing.ImageIcon; ! import javax.swing.JOptionPane; ! import javax.swing.JTextField; ! import javax.swing.UIDefaults; ! import javax.swing.UIManager; ! import javax.swing.border.*; ! import javax.swing.border.Border; ! import javax.swing.border.CompoundBorder; ! import javax.swing.plaf.BorderUIResource; ! import javax.swing.plaf.ColorUIResource; ! import javax.swing.plaf.DimensionUIResource; ! import javax.swing.plaf.FontUIResource; ! import javax.swing.plaf.IconUIResource; ! import javax.swing.plaf.InsetsUIResource; ! import javax.swing.plaf.basic.*; ! import javax.swing.text.DefaultEditorKit; ! import javax.swing.text.JTextComponent; /** --- 59,80 ---- import java.util.ResourceBundle; ! import swingwtx.swing.BorderFactory; ! import swingwtx.swing.ImageIcon; ! import swingwtx.swing.JOptionPane; ! import swingwtx.swing.JTextField; ! import swingwtx.swing.UIDefaults; ! import swingwtx.swing.UIManager; ! import swingwtx.swing.border.*; ! import swingwtx.swing.border.Border; ! import swingwtx.swing.border.CompoundBorder; ! import swingwtx.swing.plaf.BorderUIResource; ! import swingwtx.swing.plaf.ColorUIResource; ! import swingwtx.swing.plaf.DimensionUIResource; ! import swingwtx.swing.plaf.FontUIResource; ! import swingwtx.swing.plaf.IconUIResource; ! import swingwtx.swing.plaf.InsetsUIResource; ! import swingwtx.swing.plaf.basic.*; ! import swingwtx.swing.text.DefaultEditorKit; ! import swingwtx.swing.text.JTextComponent; /** *************** *** 255,263 **** SkinFileChooserUI.class.getName(), "TextFieldUI", ! "javax.swing.plaf.metal.MetalTextFieldUI", "SplitPaneUI", (Boolean.TRUE.equals(UIManager.get("JSplitPane.alternateUI")) ? (SkinSplitPaneUI.class.getName()) ! : "javax.swing.plaf.basic.BasicSplitPaneUI"), "TreeUI", SkinTreeUI.class.getName(), --- 255,263 ---- SkinFileChooserUI.class.getName(), "TextFieldUI", ! "swingwtx.swing.plaf.metal.MetalTextFieldUI", "SplitPaneUI", (Boolean.TRUE.equals(UIManager.get("JSplitPane.alternateUI")) ? (SkinSplitPaneUI.class.getName()) ! : "swingwtx.swing.plaf.basic.BasicSplitPaneUI"), "TreeUI", SkinTreeUI.class.getName(), *************** *** 377,382 **** // for JDK1.3 we use InputMap and for JDK1.1,1.2 we use KeyBindings try { ! Class.forName("javax.swing.InputMap"); ! Class uidefaults = Class.forName("javax.swing.UIDefaults"); Class[] innerClasses = uidefaults.getClasses(); java.lang.reflect.Constructor c = null; --- 377,382 ---- // for JDK1.3 we use InputMap and for JDK1.1,1.2 we use KeyBindings try { ! Class.forName("swingwtx.swing.InputMap"); ! Class uidefaults = Class.forName("swingwtx.swing.UIDefaults"); Class[] innerClasses = uidefaults.getClasses(); java.lang.reflect.Constructor c = null; *************** *** 841,845 **** * @deprecated no longer needed */ ! public static void enable() throws javax.swing.UnsupportedLookAndFeelException { SkinLookAndFeel lnf = new SkinLookAndFeel(); UIManager.setLookAndFeel(lnf); --- 841,845 ---- * @deprecated no longer needed */ ! public static void enable() throws swingwtx.swing.UnsupportedLookAndFeelException { SkinLookAndFeel lnf = new SkinLookAndFeel(); UIManager.setLookAndFeel(lnf); *************** *** 999,1007 **** UIManager.put(element.getProperty("NAME"), element.getProperty("VALUE")); } else if ( ! "Color".equalsIgnoreCase(type) || "java.awt.Color".equalsIgnoreCase(type)) { Color color = Color.decode(element.getProperty("VALUE")); UIManager.put(element.getProperty("NAME"), new ColorUIResource(color)); } else if ( ! "Insets".equalsIgnoreCase(type) || "java.awt.Insets".equalsIgnoreCase(type)) { Insets insets = parseInsets(element.getProperty("VALUE")); UIManager.put( --- 999,1007 ---- UIManager.put(element.getProperty("NAME"), element.getProperty("VALUE")); } else if ( ! "Color".equalsIgnoreCase(type) || "swingwt.awt.Color".equalsIgnoreCase(type)) { Color color = Color.decode(element.getProperty("VALUE")); UIManager.put(element.getProperty("NAME"), new ColorUIResource(color)); } else if ( ! "Insets".equalsIgnoreCase(type) || "swingwt.awt.Insets".equalsIgnoreCase(type)) { Insets insets = parseInsets(element.getProperty("VALUE")); UIManager.put( *************** *** 1010,1014 **** } else if ( "Dimension".equalsIgnoreCase(type) ! || "java.awt.Dimension".equalsIgnoreCase(type)) { Dimension dim = parseDimension(element.getProperty("VALUE")); UIManager.put( --- 1010,1014 ---- } else if ( "Dimension".equalsIgnoreCase(type) ! || "swingwt.awt.Dimension".equalsIgnoreCase(type)) { Dimension dim = parseDimension(element.getProperty("VALUE")); UIManager.put( *************** *** 1017,1021 **** } else if ( "LineBorder".equalsIgnoreCase(type) ! || "javax.swing.border.LineBorder".equalsIgnoreCase(type)) { boolean rounded = false; --- 1017,1021 ---- } else if ( "LineBorder".equalsIgnoreCase(type) ! || "swingwtx.swing.border.LineBorder".equalsIgnoreCase(type)) { boolean rounded = false; *************** *** 1060,1066 **** } else if ( "EmptyBorder".equalsIgnoreCase(type) ! || "javax.swing.border.EmptyBorder".equalsIgnoreCase(type)) { Insets insets = parseInsets(element.getProperty("VALUE")); ! Border border = new javax.swing.border.EmptyBorder(insets); UIManager.put(element.getProperty("NAME"), new BorderUIResource(border)); } --- 1060,1066 ---- } else if ( "EmptyBorder".equalsIgnoreCase(type) ! || "swingwtx.swing.border.EmptyBorder".equalsIgnoreCase(type)) { Insets insets = parseInsets(element.getProperty("VALUE")); ! Border border = new swingwtx.swing.border.EmptyBorder(insets); UIManager.put(element.getProperty("NAME"), new BorderUIResource(border)); } Index: SkinButtonUI.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/lib/skinlfFix/com/l2fprod/gui/plaf/skin/SkinButtonUI.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** SkinButtonUI.java 25 May 2004 23:10:00 -0000 1.4 --- SkinButtonUI.java 29 May 2004 01:01:10 -0000 1.4.2.1 *************** *** 48,57 **** package com.l2fprod.gui.plaf.skin; ! import javax.swing.plaf.basic.*; ! import javax.swing.plaf.*; ! import javax.swing.*; ! import javax.swing.text.View; ! import java.awt.*; /** --- 48,57 ---- package com.l2fprod.gui.plaf.skin; ! import swingwtx.swing.plaf.basic.*; ! import swingwtx.swing.plaf.*; ! import swingwtx.swing.*; ! import swingwtx.swing.text.View; ! import swingwt.awt.*; /** Index: SkinUtils.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/lib/skinlfFix/com/l2fprod/gui/plaf/skin/SkinUtils.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** SkinUtils.java 26 May 2004 01:17:22 -0000 1.2 --- SkinUtils.java 29 May 2004 01:01:10 -0000 1.2.2.1 *************** *** 50,57 **** import com.l2fprod.util.ImageUtils; ! import java.awt.Font; ! import java.awt.Image; ! import java.awt.Insets; ! import java.awt.Toolkit; import java.io.File; import java.net.URL; --- 50,57 ---- import com.l2fprod.util.ImageUtils; ! import swingwt.awt.Font; ! import swingwt.awt.Image; ! import swingwt.awt.Insets; ! import swingwt.awt.Toolkit; import java.io.File; import java.net.URL; *************** *** 59,65 **** import java.util.StringTokenizer; ! import javax.swing.UIDefaults; ! import javax.swing.UIManager; ! import javax.swing.plaf.FontUIResource; /** --- 59,65 ---- import java.util.StringTokenizer; ! import swingwtx.swing.UIDefaults; ! import swingwtx.swing.UIManager; ! import swingwtx.swing.plaf.FontUIResource; /** Index: SkinToolBarSeparatorUI.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/lib/skinlfFix/com/l2fprod/gui/plaf/skin/SkinToolBarSeparatorUI.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** SkinToolBarSeparatorUI.java 25 May 2004 23:46:20 -0000 1.2 --- SkinToolBarSeparatorUI.java 29 May 2004 01:01:10 -0000 1.2.2.1 *************** *** 7,15 **** package com.l2fprod.gui.plaf.skin; ! import java.awt.Dimension; ! import javax.swing.*; ! import javax.swing.plaf.ComponentUI; ! import javax.swing.plaf.basic.BasicToolBarSeparatorUI; --- 7,15 ---- package com.l2fprod.gui.plaf.skin; ! import swingwt.awt.Dimension; ! import swingwtx.swing.*; ! import swingwtx.swing.plaf.ComponentUI; ! import swingwtx.swing.plaf.basic.BasicToolBarSeparatorUI; *************** *** 23,27 **** /* (non-Javadoc) ! * @see javax.swing.plaf.ComponentUI#getMaximumSize(javax.swing.JComponent) */ public Dimension getMaximumSize(JComponent c) { --- 23,27 ---- /* (non-Javadoc) ! * @see swingwtx.swing.plaf.ComponentUI#getMaximumSize(javax.swing.JComponent) */ public Dimension getMaximumSize(JComponent c) { *************** *** 35,39 **** /* (non-Javadoc) ! * @see javax.swing.plaf.ComponentUI#getPreferredSize(javax.swing.JComponent) */ public Dimension getPreferredSize(JComponent c) { --- 35,39 ---- /* (non-Javadoc) ! * @see swingwtx.swing.plaf.ComponentUI#getPreferredSize(javax.swing.JComponent) */ public Dimension getPreferredSize(JComponent c) { *************** *** 53,57 **** /* (non-Javadoc) ! * @see javax.swing.plaf.ComponentUI#createUI(javax.swing.JComponent) */ public static ComponentUI createUI(JComponent c) { --- 53,57 ---- /* (non-Javadoc) ! * @see swingwtx.swing.plaf.ComponentUI#createUI(javax.swing.JComponent) */ public static ComponentUI createUI(JComponent c) { |
From: Zlatin B. <zl...@us...> - 2004-05-29 01:02:02
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/fileTransfer/search Modified Files: Tag: swt-gui-branch SearchPanel.java SearchTableFormat.java Log Message: its crippled but almost compiles Index: SearchTableFormat.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search/SearchTableFormat.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** SearchTableFormat.java 22 May 2004 02:46:50 -0000 1.3 --- SearchTableFormat.java 29 May 2004 01:01:16 -0000 1.3.2.1 *************** *** 7,15 **** package frost.fileTransfer.search; ! import java.awt.*; import java.util.Comparator; ! import javax.swing.*; ! import javax.swing.table.*; import frost.util.gui.translation.*; --- 7,15 ---- package frost.fileTransfer.search; ! import swingwt.awt.*; import java.util.Comparator; ! import swingwtx.swing.*; ! import swingwtx.swing.table.*; import frost.util.gui.translation.*; *************** *** 117,121 **** /* (non-Javadoc) ! * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) */ public Component getTableCellRendererComponent( --- 117,121 ---- /* (non-Javadoc) ! * @see swingwtx.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) */ public Component getTableCellRendererComponent( *************** *** 130,134 **** setHorizontalAlignment(SwingConstants.RIGHT); // col is right aligned, give some space to next column ! setBorder(new javax.swing.border.EmptyBorder(0, 0, 0, 3)); return this; } --- 130,134 ---- setHorizontalAlignment(SwingConstants.RIGHT); // col is right aligned, give some space to next column ! setBorder(new swingwtx.swing.border.EmptyBorder(0, 0, 0, 3)); return this; } Index: SearchPanel.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/search/SearchPanel.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** SearchPanel.java 22 May 2004 02:46:50 -0000 1.5 --- SearchPanel.java 29 May 2004 01:01:15 -0000 1.5.2.1 *************** *** 4,15 **** package frost.fileTransfer.search; ! import java.awt.*; ! import java.awt.event.*; import java.beans.*; import java.util.*; import java.util.logging.Logger; ! import javax.swing.*; ! import javax.swing.event.*; import frost.*; --- 4,15 ---- package frost.fileTransfer.search; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.beans.*; import java.util.*; import java.util.logging.Logger; ! import swingwtx.swing.*; ! import swingwtx.swing.event.*; import frost.*; *************** *** 90,94 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 90,94 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 166,170 **** /* (non-Javadoc) ! * @see javax.swing.JPopupMenu#show(java.awt.Component, int, int) */ public void show(Component invoker, int x, int y) { --- 166,170 ---- /* (non-Javadoc) ! * @see swingwtx.swing.JPopupMenu#show(swingwt.awt.Component, int, int) */ public void show(Component invoker, int x, int y) { *************** *** 221,225 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 221,225 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 236,240 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ public void mousePressed(MouseEvent e) { --- 236,240 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ public void mousePressed(MouseEvent e) { *************** *** 252,256 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { --- 252,256 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { *************** *** 287,291 **** /* (non-Javadoc) ! * @see javax.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent) */ public void valueChanged(ListSelectionEvent e) { --- 287,291 ---- /* (non-Javadoc) ! * @see swingwtx.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent) */ public void valueChanged(ListSelectionEvent e) { |
From: Zlatin B. <zl...@us...> - 2004-05-29 01:02:01
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/upload In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/fileTransfer/upload Modified Files: Tag: swt-gui-branch UploadPanel.java UploadTableFormat.java Log Message: its crippled but almost compiles Index: UploadTableFormat.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/upload/UploadTableFormat.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** UploadTableFormat.java 22 May 2004 02:46:50 -0000 1.5 --- UploadTableFormat.java 29 May 2004 01:01:16 -0000 1.5.2.1 *************** *** 7,15 **** package frost.fileTransfer.upload; ! import java.awt.Component; import java.util.Comparator; ! import javax.swing.*; ! import javax.swing.table.*; import frost.util.gui.translation.*; --- 7,15 ---- package frost.fileTransfer.upload; ! import swingwt.awt.Component; import java.util.Comparator; ! import swingwtx.swing.*; ! import swingwtx.swing.table.*; import frost.util.gui.translation.*; *************** *** 31,35 **** /* (non-Javadoc) ! * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) */ public Component getTableCellRendererComponent( --- 31,35 ---- /* (non-Javadoc) ! * @see swingwtx.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) */ public Component getTableCellRendererComponent( *************** *** 43,47 **** setHorizontalAlignment(SwingConstants.RIGHT); // col is right aligned, give some space to next column ! setBorder(new javax.swing.border.EmptyBorder(0, 0, 0, 3)); return this; } --- 43,47 ---- setHorizontalAlignment(SwingConstants.RIGHT); // col is right aligned, give some space to next column ! setBorder(new swingwtx.swing.border.EmptyBorder(0, 0, 0, 3)); return this; } Index: UploadPanel.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/fileTransfer/upload/UploadPanel.java,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** UploadPanel.java 22 May 2004 02:53:43 -0000 1.7 --- UploadPanel.java 29 May 2004 01:01:16 -0000 1.7.2.1 *************** *** 4,9 **** package frost.fileTransfer.upload; ! import java.awt.*; ! import java.awt.event.*; import java.beans.*; import java.io.File; --- 4,9 ---- package frost.fileTransfer.upload; ! import swingwt.awt.*; ! import swingwt.awt.event.*; import java.beans.*; import java.io.File; *************** *** 11,15 **** import java.util.logging.Logger; ! import javax.swing.*; import frost.*; --- 11,15 ---- import java.util.logging.Logger; ! import swingwtx.swing.*; import frost.*; *************** *** 100,104 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 100,104 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 252,256 **** /* (non-Javadoc) ! * @see javax.swing.JPopupMenu#show(java.awt.Component, int, int) */ public void show(Component invoker, int x, int y) { --- 252,256 ---- /* (non-Javadoc) ! * @see swingwtx.swing.JPopupMenu#show(swingwt.awt.Component, int, int) */ public void show(Component invoker, int x, int y) { *************** *** 370,374 **** /* (non-Javadoc) ! * @see java.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent) */ public void keyPressed(KeyEvent e) { --- 370,374 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent) */ public void keyPressed(KeyEvent e) { *************** *** 379,383 **** /* (non-Javadoc) ! * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent) */ public void keyReleased(KeyEvent e) { --- 379,383 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent) */ public void keyReleased(KeyEvent e) { *************** *** 386,390 **** /* (non-Javadoc) ! * @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent) */ public void keyTyped(KeyEvent e) { --- 386,390 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent) */ public void keyTyped(KeyEvent e) { *************** *** 393,397 **** /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { --- 393,397 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { *************** *** 402,406 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ public void mousePressed(MouseEvent e) { --- 402,406 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ public void mousePressed(MouseEvent e) { *************** *** 418,422 **** /* (non-Javadoc) ! * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { --- 418,422 ---- /* (non-Javadoc) ! * @see swingwt.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ public void mouseReleased(MouseEvent e) { |
From: Zlatin B. <zl...@us...> - 2004-05-29 01:02:01
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/threads/maintenance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/threads/maintenance Modified Files: Tag: swt-gui-branch ResendFailedMessagesThread.java Truster.java Log Message: its crippled but almost compiles Index: ResendFailedMessagesThread.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/threads/maintenance/ResendFailedMessagesThread.java,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -d -r1.8 -r1.8.2.1 *** ResendFailedMessagesThread.java 22 May 2004 02:53:41 -0000 1.8 --- ResendFailedMessagesThread.java 29 May 2004 01:01:21 -0000 1.8.2.1 *************** *** 7,11 **** package frost.threads.maintenance; ! import java.awt.Frame; import java.io.File; import java.util.ArrayList; --- 7,11 ---- package frost.threads.maintenance; ! import swingwt.awt.Frame; import java.io.File; import java.util.ArrayList; Index: Truster.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/threads/maintenance/Truster.java,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** Truster.java 22 May 2004 02:53:41 -0000 1.12 --- Truster.java 29 May 2004 01:01:21 -0000 1.12.2.1 *************** *** 11,15 **** import java.util.logging.*; ! import javax.swing.SwingUtilities; import frost.*; --- 11,15 ---- import java.util.logging.*; ! import swingwtx.swing.SwingUtilities; import frost.*; |
From: Zlatin B. <zl...@us...> - 2004-05-29 01:02:01
|
Update of /cvsroot/jtcfrost/frost-wot/source/frost/threads In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26084/source/frost/threads Modified Files: Tag: swt-gui-branch MessageUploadThread.java Log Message: its crippled but almost compiles Index: MessageUploadThread.java =================================================================== RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/threads/MessageUploadThread.java,v retrieving revision 1.54 retrieving revision 1.54.2.1 diff -C2 -d -r1.54 -r1.54.2.1 *** MessageUploadThread.java 25 May 2004 07:22:07 -0000 1.54 --- MessageUploadThread.java 29 May 2004 01:01:20 -0000 1.54.2.1 *************** *** 20,29 **** package frost.threads; ! import java.awt.Frame; import java.io.*; import java.util.*; import java.util.logging.*; ! import javax.swing.JOptionPane; import org.w3c.dom.Document; --- 20,29 ---- package frost.threads; ! import swingwt.awt.Frame; import java.io.*; import java.util.*; import java.util.logging.*; ! import swingwtx.swing.JOptionPane; import org.w3c.dom.Document; |