formatting

2 files changed, 61 insertions, 72 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 9dcf7e5b..6ec350a3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -129,8 +129,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	private final JMenuItem mnuDownload = new JMenuItem("Download");
 	private final JMenuItem mnuVmConfig = new JMenuItem("VM-Konfiguration");
 	private final JMenuItem mnuDelete = new JMenuItem("Löschen");
-	private final JMenuItem mnuExtendExpiryDate = new JMenuItem(
-			"Ablaufzeitpunkt verlängern");
+	private final JMenuItem mnuExtendExpiryDate = new JMenuItem("Ablaufzeitpunkt verlängern");
 
 	private boolean metadataChanged = false;
 	private boolean permissionsChanged = false;
@@ -203,9 +202,10 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					@Override
 					public void userAdded(UserInfo user, UserListWindow window) {
 						window.dispose();
-						if (Gui.showMessageBox(me, "Sind Sie sicher, dass sie die Besitzerrechte an "
-								+ "einen anderen Benutzer übertragen wollen?", MessageType.QUESTION_YESNO,
-								LOGGER, null))
+						if (Gui.showMessageBox(me,
+								"Sind Sie sicher, dass sie die Besitzerrechte an "
+										+ "einen anderen Benutzer übertragen wollen?",
+								MessageType.QUESTION_YESNO, LOGGER, null))
 							setImageOwner(user);
 					}
 
@@ -270,8 +270,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		}
 
 		// keyboard shortcut
-		tblVersions.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-				KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
+		tblVersions.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+				.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
 		tblVersions.getActionMap().put("delete", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
@@ -317,13 +317,15 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					if (e.isPopupTrigger()) {
 						boolean multiSelection = tblVersions.getSelectedRowCount() != 1;
 						ImageVersionDetails selectedVersion = tblVersions.getSelectedItem();
-						mnuNewLecture.setEnabled(!multiSelection && selectedVersion.isValid
-								&& ImagePerms.canLink(image));
+						mnuNewLecture.setEnabled(
+								!multiSelection && selectedVersion.isValid && ImagePerms.canLink(image));
 						mnuDownload.setEnabled(!multiSelection && ImagePerms.canDownload(image));
 						mnuVmConfig.setEnabled(!multiSelection && selectedVersion.isValid
-								&& ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH));
+								&& ImagePerms.canEdit(image) && (image.shareMode == ShareMode.LOCAL
+										|| image.shareMode == ShareMode.PUBLISH));
 						mnuDelete.setEnabled(ImagePerms.canEdit(image));
-						mnuExtendExpiryDate.setEnabled(!multiSelection && (selectedVersion.isValid || Session.hasFeature(Feature.EXTEND_EXPIRED_VM)));
+						mnuExtendExpiryDate.setEnabled(!multiSelection && (selectedVersion.isValid
+								|| Session.hasFeature(Feature.EXTEND_EXPIRED_VM)));
 						pop.show(e.getComponent(), e.getX(), e.getY());
 					}
 				}
@@ -378,20 +380,23 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	private void editVmConfig(final ImageVersionDetails selected) {
 		QuickTimer.scheduleOnce(new Task() {
 			ByteBuffer machineDescription = null;
+
 			@Override
 			public void fire() {
 				try {
-					machineDescription = ThriftManager.getSatClient().getImageVersionVirtConfig(Session.getSatelliteToken(), selected.versionId);
+					machineDescription = ThriftManager.getSatClient()
+							.getImageVersionVirtConfig(Session.getSatelliteToken(), selected.versionId);
 				} catch (TException e) {
-					LOGGER.error("Failed to retrieve virtualizer config for image version "
-							+ "'" + image.latestVersionId + ", see trace: ", e);
+					LOGGER.error("Failed to retrieve virtualizer config for image version " + "'"
+							+ image.latestVersionId + ", see trace: ", e);
 					return;
 				}
 				Gui.asyncExec(new Runnable() {
 					@Override
 					public void run() {
 						if (machineDescription == null) {
-							Gui.showMessageBox("Konnte VM-Konfiguration nicht abrufen.", MessageType.ERROR, LOGGER, null);
+							Gui.showMessageBox("Konnte VM-Konfiguration nicht abrufen.", MessageType.ERROR,
+									LOGGER, null);
 							return;
 						}
 
@@ -504,14 +509,14 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			public void fire() {
 				final String transferId;
 				try {
-					transferId = ThriftManager.getSatClient().publishImageVersion(
-							Session.getSatelliteToken(), image.latestVersionId);
+					transferId = ThriftManager.getSatClient().publishImageVersion(Session.getSatelliteToken(),
+							image.latestVersionId);
 				} catch (TException e1) {
 					ThriftError.showMessage(me, LOGGER, e1,
 							"Upload der VM auf den Masterserver fehlgeschlagen."
-							+ " Prüfen Sie, ob Sie bei der Registrierung dem landesweiten VM-Austausch zugestimmt haben.\n"
-							+ " Sie können dies hier überprüfen:\n"
-							+ OpenLinks.Link.REGISTER_BWIDM.uri.toString() + "\n\n");
+									+ " Prüfen Sie, ob Sie bei der Registrierung dem landesweiten VM-Austausch zugestimmt haben.\n"
+									+ " Sie können dies hier überprüfen:\n"
+									+ OpenLinks.Link.REGISTER_BWIDM.uri.toString() + "\n\n");
 					return;
 				}
 				Gui.asyncExec(new Runnable() {
@@ -519,12 +524,12 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					public void run() {
 						MainWindow.addPassiveTransfer(transferId, image.imageName, true);
 						// Inform user
-						Gui.showMessageBox(
-								ImageDetailsWindow.this,
+						Gui.showMessageBox(ImageDetailsWindow.this,
 								"Die Übertragung läuft direkt zwischen Satellitenserver und"
 										+ " dem Zentral-Server in Freiburg.\n"
 										+ "Wenn Sie die bwLehrpool-Suite schließen, wird der Transfer trotzdem"
-										+ "weiterlaufen.", MessageType.INFO, null, null);
+										+ "weiterlaufen.",
+								MessageType.INFO, null, null);
 					}
 				});
 			}
@@ -553,9 +558,9 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			// first build the ImageBaseWrite from the GUI fields
 			final ImageBaseWrite ibw = new ImageBaseWrite(txtTitle.getText(), txtDescription.getText(),
 					cboOperatingSystem.getItemAt(cboOperatingSystem.getSelectedIndex()).osId, image.virtId,
-					chkIsTemplate.isSelected(), new ImagePermissions(image.defaultPermissions.link,
-							image.defaultPermissions.download, image.defaultPermissions.edit,
-							image.defaultPermissions.admin),
+					chkIsTemplate.isSelected(),
+					new ImagePermissions(image.defaultPermissions.link, image.defaultPermissions.download,
+							image.defaultPermissions.edit, image.defaultPermissions.admin),
 					cboShareMode.getItemAt(cboShareMode.getSelectedIndex()));
 			try {
 				actionHandler.updateImageBase(image.getImageBaseId(), ibw);
@@ -638,28 +643,25 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		int count = 0;
 		for (ImageVersionDetails img : versions) {
 			try {
-				ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(),
-						img.versionId,
+				ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(), img.versionId,
 						Util.unixTime() + Session.getSatelliteConfig().maxImageValidityDays * 86400);
 				// Yes it's the same call twice to work around bug #3179 :-(
 				// TODO: Remove some time during 2018
-				ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(),
-						img.versionId,
+				ThriftManager.getSatClient().setImageVersionExpiry(Session.getSatelliteToken(), img.versionId,
 						Util.unixTime() + Session.getSatelliteConfig().maxImageValidityDays * 86400);
 				count++;
 			} catch (TException e) {
-				ThriftError.showMessage(this, LOGGER, e, "Konnte Ablaufdatum der Version " + img.versionId
-						+ " nicht verlängern.");
+				ThriftError.showMessage(this, LOGGER, e,
+						"Konnte Ablaufdatum der Version " + img.versionId + " nicht verlängern.");
 			}
 		}
 		if (count > 0) {
-			Gui.showMessageBox(this, "Erfolgreich verlängerte Abbilder: " + count, MessageType.INFO, null, null);
+			Gui.showMessageBox(this, "Erfolgreich verlängerte Abbilder: " + count, MessageType.INFO, null,
+					null);
 			refresh(true);
 		}
 	}
 
-
-
 	/********************************************************************************
 	 * 
 	 * General UI helpers
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
index 0e108d0a..620d6bc7 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
@@ -46,11 +46,9 @@ import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
 @SuppressWarnings("serial")
-public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
-		UiFeedback, DownloadCallback {
+public class ImagePublishedWindow extends ImagePublishedWindowLayout implements UiFeedback, DownloadCallback {
 
-	private final static Logger LOGGER = Logger
-			.getLogger(ImagePublishedWindow.class);
+	private final static Logger LOGGER = Logger.getLogger(ImagePublishedWindow.class);
 	private final ImagePublishedWindow me = this;
 
 	// Filtering: matches against image's name, user's first/last name or email and organisation name of the owner
@@ -109,35 +107,30 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 				String transferToken = null;
 				try {
 					transferToken = ThriftManager.getSatClient()
-							.requestImageReplication(
-									Session.getSatelliteToken(),
-									item.latestVersionId);
+							.requestImageReplication(Session.getSatelliteToken(), item.latestVersionId);
 				} catch (TException ex) {
-					ThriftError.showMessage(me, LOGGER, ex,
-							"Could not start download");
+					ThriftError.showMessage(me, LOGGER, ex, "Could not start download");
 					return;
 				}
-				MainWindow.addPassiveTransfer(transferToken, item.imageName,
-						false);
-				Gui.showMessageBox(ImagePublishedWindow.this, "Die Übertragung läuft direkt zwischen Satellitenserver und"
-						+ " dem Zentral-Server in Freiburg.\n"
-						+ "Wenn Sie die bwLehrpool-Suite schließen, wird der Transfer trotzdem"
-						+ "weiterlaufen.", MessageType.INFO, null, null);
+				MainWindow.addPassiveTransfer(transferToken, item.imageName, false);
+				Gui.showMessageBox(ImagePublishedWindow.this,
+						"Die Übertragung läuft direkt zwischen Satellitenserver und"
+								+ " dem Zentral-Server in Freiburg.\n"
+								+ "Wenn Sie die bwLehrpool-Suite schließen, wird der Transfer trotzdem"
+								+ "weiterlaufen.",
+						MessageType.INFO, null, null);
 			}
 		});
 
 		btnDownload.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				final ImageSummaryRead item = imagePublishedTable
-						.getSelectedItem();
+				final ImageSummaryRead item = imagePublishedTable.getSelectedItem();
 				if (item == null)
 					return;
 				btnDownload.setEnabled(false);
-				ThriftActions.initDownload(
-						(JFrame) SwingUtilities.getWindowAncestor(me),
-						item.latestVersionId, item.imageName, item.virtId,
-						item.osId, item.fileSize, null);
+				ThriftActions.initDownload((JFrame) SwingUtilities.getWindowAncestor(me),
+						item.latestVersionId, item.imageName, item.virtId, item.osId, item.fileSize, null);
 			}
 		});
 
@@ -162,8 +155,7 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 		imagePublishedTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
 			@Override
 			public void valueChanged(ListSelectionEvent e) {
-				ImageSummaryRead item = imagePublishedTable
-						.getSelectedItem();
+				ImageSummaryRead item = imagePublishedTable.getSelectedItem();
 				updateAvailableOptions(item);
 			}
 		});
@@ -171,20 +163,13 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 		imagePublishedTable.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
-				if (SwingUtilities.isLeftMouseButton(e)
-						&& e.getClickCount() == 2) {
-					ImageSummaryRead item = imagePublishedTable
-							.getSelectedItem();
+				if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2) {
+					ImageSummaryRead item = imagePublishedTable.getSelectedItem();
 					if (item == null || item.getImageBaseId() == null)
 						return;
-					ImageDetailsWindow.open(
-							JOptionPane
-									.getFrameForComponent(ImagePublishedWindow.this),
-							item.getImageBaseId(),
-							null,
-							new ImagePublishedDetailsActions(
-									JOptionPane
-											.getFrameForComponent(ImagePublishedWindow.this)));
+					ImageDetailsWindow.open(JOptionPane.getFrameForComponent(ImagePublishedWindow.this),
+							item.getImageBaseId(), null, new ImagePublishedDetailsActions(
+									JOptionPane.getFrameForComponent(ImagePublishedWindow.this)));
 				}
 				processClick(e);
 			}
@@ -211,11 +196,13 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 		// init data
 		refreshList(true, 0);
 	}
+
 	private void updateAvailableOptions(ImageSummaryRead item) {
 		btnDownload.setEnabled(item != null);
 		if (Session.isImagePublishSupported())
 			btnSatDownload.setEnabled(item != null);
 	}
+
 	/**
 	 * Called when a change occurs in the filter search field
 	 */
@@ -232,6 +219,7 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 		RowFilter<ListModel<ImageSummaryRead>, Integer> andFilters = RowFilter.andFilter(filters);
 		imagePublishedTable.getRowSorter().setRowFilter(andFilters);
 	}
+
 	/**
 	 * Callback when download initialized
 	 * 
@@ -260,8 +248,7 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 		QuickTimer.scheduleOnce(new Task() {
 			@Override
 			public void fire() {
-				final List<ImageSummaryRead> imagePublishedList = ImagePublishedCache
-						.get(forceRefresh);
+				final List<ImageSummaryRead> imagePublishedList = ImagePublishedCache.get(forceRefresh);
 				if (imagePublishedList == null)
 					return;
 				Gui.asyncExec(new Runnable() {