diff options
3 files changed, 9 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java index 302f0fba..3bc3d8bf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ImageTable.java @@ -104,7 +104,9 @@ class ImageTableRenderer extends TableRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - // column 0 and 6 don't have to be changed ( already string/ checkbox) + if (value == null) + value = "-"; + // column 0, 5 and 6 don't have to be changed ( already string/ checkbox) if (column == 1) value = FormatHelper.osName(MetaDataCache.getOsById((int)value)); if (column == 2) @@ -112,9 +114,7 @@ class ImageTableRenderer extends TableRenderer { if (column == 3) value = FormatHelper.longDate((long) value); if (column == 4) - value = value == null ? "-" : FormatHelper.bytes((long) value, false); - if (column == 5) - value = value == null ? "-" : value; + value = FormatHelper.bytes((long) value, false); if( column > 6 || column < 0) throw new IndexOutOfBoundsException(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java index c5ec11e7..ae49b6f1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/LectureTable.java @@ -66,6 +66,8 @@ class LectureTableRenderer extends TableRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + if (value == null) + value = "-"; if (column == 1) value = FormatHelper.userName(UserCache.find((String) value)); if (column == 2) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java index 5a2b799c..b42bbd6e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java @@ -51,6 +51,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog { protected final JTextField txtVersion; protected final JButton btnSaveChanges; + protected final JButton btnUpdateImage; protected final JButton btnClose; protected final ImageVersionTable versionTable; @@ -183,7 +184,9 @@ public abstract class ImageDetailsWindowLayout extends JDialog { buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS)); btnSaveChanges = new JButton("Speichern"); btnClose = new JButton("Schließen"); + btnUpdateImage = new JButton("Neue Imageversion hochladen"); buttonPanel.add(btnSaveChanges); + buttonPanel.add(btnUpdateImage); buttonPanel.add(Box.createGlue()); buttonPanel.add(btnClose); |