STY: Formatting

src/main/java/caosdb/server/jobs/core/PickUp.java

@@ -70,11 +70,14 @@ public class PickUp extends EntityJob {
 
   @Override
   public boolean notifyObserver(final String e, final Observable o) {
-    if (e == Entity.ENTITY_STATUS_CHANGED_EVENT && o == getEntity() && this.rollBack && getEntity().getEntityStatus() == EntityStatus.UNQUALIFIED) {
-        final File target = new File(FileSystem.getDropOffBox() + this.dropOffBoxPath);
-        getEntity().getFileProperties().getFile().renameTo(target);
-        this.rollBack = false;
-        return false;
+    if (e == Entity.ENTITY_STATUS_CHANGED_EVENT
+        && o == getEntity()
+        && this.rollBack
+        && getEntity().getEntityStatus() == EntityStatus.UNQUALIFIED) {
+      final File target = new File(FileSystem.getDropOffBox() + this.dropOffBoxPath);
+      getEntity().getFileProperties().getFile().renameTo(target);
+      this.rollBack = false;
+      return false;
     }
     return true;
   }

src/main/java/caosdb/server/jobs/extension/SQLiteTransaction.java

@@ -22,6 +22,11 @@
  */
 package caosdb.server.jobs.extension;
 
+import caosdb.server.CaosDBException;
+import caosdb.server.entity.FileProperties;
+import caosdb.server.entity.Message;
+import caosdb.server.jobs.EntityJob;
+import caosdb.server.utils.FileUtils;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.Connection;
@@ -34,11 +39,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
-import caosdb.server.CaosDBException;
-import caosdb.server.entity.FileProperties;
-import caosdb.server.entity.Message;
-import caosdb.server.jobs.EntityJob;
-import caosdb.server.utils.FileUtils;
 
 public class SQLiteTransaction extends EntityJob {
   private static HashMap<String, ReentrantLock> lockedTables = new HashMap<String, ReentrantLock>();

src/main/java/caosdb/server/transaction/Transaction.java

@@ -22,9 +22,6 @@
  */
 package caosdb.server.transaction;
 
-import java.util.HashMap;
-import java.util.List;
-import org.apache.shiro.subject.Subject;
 import caosdb.datetime.UTCDateTime;
 import caosdb.server.accessControl.AuthenticationUtils;
 import caosdb.server.accessControl.Principal;
@@ -49,6 +46,9 @@ import caosdb.server.jobs.core.PickUp;
 import caosdb.server.utils.AbstractObservable;
 import caosdb.server.utils.Info;
 import caosdb.server.utils.Observer;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.shiro.subject.Subject;
 
 public abstract class Transaction<C extends TransactionContainer> extends AbstractObservable
     implements TransactionInterface {
@@ -66,11 +66,10 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
   protected Transaction(final C container) {
     this(container, Info.getInstance());
   }
-  
-  protected Transaction(C container, Observer o){    
+
+  protected Transaction(C container, Observer o) {
     this.container = container;
-    if(o!=null)
-    acceptObserver(o);
+    if (o != null) acceptObserver(o);
   }
 
   public static DatabaseMonitor getMonitor() {
@@ -83,21 +82,16 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
 
   protected void makeSchedule() throws Exception {
     // load flag jobs
-    final Job loadContainerFlags =
-        Job.getJob("LoadContainerFlagJobs", Mode.MUST, null, this);
+    final Job loadContainerFlags = Job.getJob("LoadContainerFlagJobs", Mode.MUST, null, this);
     this.schedule.add(loadContainerFlags);
     this.schedule.runJob(loadContainerFlags);
 
     // all transactions are atomic
-    this.schedule.add(
-        Job.getJob(Atomic.class.getSimpleName(), Mode.MUST, null, this));
+    this.schedule.add(Job.getJob(Atomic.class.getSimpleName(), Mode.MUST, null, this));
 
     // AccessControl
-    this.schedule.add(
-        Job.getJob(AccessControl.class.getSimpleName(), Mode.MUST, null, this));
-    this.schedule.add(
-        Job.getJob(
-            CheckEntityACLRoles.class.getSimpleName(), Mode.MUST, null,  this));
+    this.schedule.add(Job.getJob(AccessControl.class.getSimpleName(), Mode.MUST, null, this));
+    this.schedule.add(Job.getJob(CheckEntityACLRoles.class.getSimpleName(), Mode.MUST, null, this));
 
     for (final EntityInterface e : getContainer()) {
       final List<Job> loadJobs = Job.loadJobs(e, this);

src/main/java/caosdb/server/utils/ServerMessages.java

@@ -419,11 +419,18 @@ public class ServerMessages {
   public static final Message SERVER_SIDE_SCRIPT_MISSING_CALL =
       new Message(MessageType.Error, 400, "You must specify the `call` field.");
 
-  public static final Message ADDITIONAL_PROPERTY = new Message(MessageType.Warning,0,"This property is an additional property which has no corresponding properties among the properties of the parents.");
+  public static final Message ADDITIONAL_PROPERTY =
+      new Message(
+          MessageType.Warning,
+          0,
+          "This property is an additional property which has no corresponding properties among the properties of the parents.");
+
+  public static final Message PROPERTY_WITH_DATATYPE_OVERRIDE =
+      new Message(MessageType.Warning, 0, "This property overrides the datatype.");
+
+  public static final Message PROPERTY_WITH_DESC_OVERRIDE =
+      new Message(MessageType.Warning, 0, "This property overrides the description.");
 
-  public static final Message PROPERTY_WITH_DATATYPE_OVERRIDE = new Message(MessageType.Warning,0,"This property overrides the datatype.");
-  
-  public static final Message PROPERTY_WITH_DESC_OVERRIDE = new Message(MessageType.Warning,0,"This property overrides the description.");
-  
-  public static final Message PROPERTY_WITH_NAME_OVERRIDE = new Message(MessageType.Warning,0,"This property overrides the name.");
+  public static final Message PROPERTY_WITH_NAME_OVERRIDE =
+      new Message(MessageType.Warning, 0, "This property overrides the name.");
 }