Simple refactoring so that the code for creating a column isn't duplicated unnecessarily.
| 597 | 599 | |
|---|---|---|
| 167 | 167 | colWidth = JConfig.queryDisplayProperty(curColumnName); |
| 168 | 168 | } |
| 169 | 169 | if(colWidth != null) { |
| 170 | TableColumn tc = new TableColumn(i); | |
| 171 | tc.setHeaderValue(curColumnName); | |
| 172 | tc.setIdentifier(curColumnName); | |
| 173 | addColumn(tc); | |
| 174 | 170 | int dotIndex = colWidth.indexOf('.'); |
| 175 | if(dotIndex != -1) { | |
| 171 | if (dotIndex != -1) { | |
| 176 | 172 | String colIndex = colWidth.substring(0, dotIndex); |
| 177 | colWidth = colWidth.substring(dotIndex+1); | |
| 173 | colWidth = colWidth.substring(dotIndex + 1); | |
| 178 | 174 | initialToSaved.put(curColumnName, Integer.parseInt(colIndex)); |
| 179 | 175 | } |
| 180 | getColumn(curColumnName).setPreferredWidth(Integer.parseInt(colWidth)); | |
| 181 | getColumn(curColumnName).setWidth(Integer.parseInt(colWidth)); | |
| 176 | makeNewColumn(curColumnName, colWidth); | |
| 182 | 177 | } |
| 183 | 178 | } |
| 184 | 179 | } catch(Exception e) { |
| --- | --- | |
| 194 | 189 | ErrorManagement.logMessage("Column data for '\" + prefix + \"' was corrupted; resetting to defaults"); |
| 195 | 190 | notify_delay += 2 * Constants.ONE_SECOND; |
| 196 | 191 | for(String[] column : DEFAULT_COLUMNS) { |
| 197 | if(column[0].equals("Time left") && prefix.equals("complete")) continue; | |
| 192 | String column_name = column[0]; | |
| 193 | String column_width = column[1]; | |
| 198 | 194 | |
| 199 | TableColumn tc = new TableColumn(TableColumnController.getInstance().getColumnNumber(column[0])); | |
| 200 | tc.setHeaderValue(column[0]); | |
| 201 | tc.setIdentifier(column[0]); | |
| 202 | addColumn(tc); | |
| 203 | getColumn(column[0]).setPreferredWidth(Integer.parseInt(column[1])); | |
| 204 | getColumn(column[0]).setWidth(Integer.parseInt(column[1])); | |
| 195 | if (column_name.equals("Time left") && prefix.equals("complete")) continue; | |
| 196 | makeNewColumn(column_name, column_width); | |
| 205 | 197 | } |
| 206 | 198 | } |
| 207 | 199 | |
| --- | --- | |
| 217 | 209 | } |
| 218 | 210 | } |
| 219 | 211 | } |
| 212 | ||
| 213 | private void makeNewColumn(String curColumnName, String colWidth) { | |
| 214 | TableColumn tc = new TableColumn(TableColumnController.getInstance().getColumnNumber(curColumnName)); | |
| 215 | tc.setHeaderValue(curColumnName); | |
| 216 | tc.setIdentifier(curColumnName); | |
| 217 | addColumn(tc); | |
| 218 | getColumn(curColumnName).setPreferredWidth(Integer.parseInt(colWidth)); | |
| 219 | getColumn(curColumnName).setWidth(Integer.parseInt(colWidth)); | |
| 220 | } | |
| 220 | 221 | } |
