From 6c2a94ecc5a6b29ff8b090f731fa4b671f4eb54d Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 8 Dec 2015 15:24:47 +0100
Subject: [PATCH] Remove SketchCodeDocument

This class served no purpose anymore, so it can be removed. The
`SketchCode.getMetadata()` and `setMetaData()` methods only served to
keep track of a SketchCodeDocument instance (and were no longer used),
so these are removed too, just like some SketchCode constructors dealing
with this metadata object.
---
 app/src/processing/app/Sketch.java            |  9 ++---
 .../processing/app/SketchCodeDocument.java    | 33 -------------------
 .../src/processing/app/SketchCode.java        | 21 ------------
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 app/src/processing/app/SketchCodeDocument.java

diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index e9b65094e..59c63a0bd 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -90,11 +90,6 @@ public class Sketch {
   protected void load(boolean forceUpdate) throws IOException {
     data.load();
 
-    for (SketchCode code : data.getCodes()) {
-      if (code.getMetadata() == null)
-        code.setMetadata(new SketchCodeDocument(this, code));
-    }
-
     // set the main file to be the current tab
     if (editor != null) {
       int current = editor.getCurrentTabIndex();
@@ -401,7 +396,7 @@ public class Sketch {
         return;
       }
       ensureExistence();
-      SketchCode code = (new SketchCodeDocument(this, newFile)).getCode();
+      SketchCode code = new SketchCode(newFile);
       try {
         editor.addTab(code, "");
       } catch (IOException e) {
@@ -861,7 +856,7 @@ public class Sketch {
     }
 
     if (codeExtension != null) {
-      SketchCode newCode = (new SketchCodeDocument(this, destFile)).getCode();
+      SketchCode newCode = new SketchCode(destFile);
 
       if (replacement) {
         data.replaceCode(newCode);
diff --git a/app/src/processing/app/SketchCodeDocument.java b/app/src/processing/app/SketchCodeDocument.java
deleted file mode 100644
index 0f178570a..000000000
--- a/app/src/processing/app/SketchCodeDocument.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package processing.app;
-
-import java.io.File;
-
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.Document;
-
-public class SketchCodeDocument {
-
-  private SketchCode code;
-  private Sketch sketch;
-
-  public SketchCodeDocument(Sketch sketch, SketchCode code) {
-    this.code = code;
-    this.sketch = sketch;
-    this.code.setMetadata(this);
-  }
-
-  public SketchCodeDocument(Sketch sketch, File file) {
-    this(sketch, new SketchCode(file));
-  }
-
-  public SketchCode getCode() {
-    return code;
-  }
-
-  public void setCode(SketchCode code) {
-    this.code = code;
-  }
-
-  
-}
diff --git a/arduino-core/src/processing/app/SketchCode.java b/arduino-core/src/processing/app/SketchCode.java
index 23b2f70de..12f9fd680 100644
--- a/arduino-core/src/processing/app/SketchCode.java
+++ b/arduino-core/src/processing/app/SketchCode.java
@@ -45,8 +45,6 @@ public class SketchCode {
    */
   private File file;
 
-  private Object metadata;
-
   /**
    * Interface for an in-memory storage of text file contents. This is
    * intended to allow a GUI to keep modified text in memory, and allow
@@ -74,16 +72,7 @@ public class SketchCode {
   private TextStorage storage;
 
   public SketchCode(File file) {
-    init(file, null);
-  }
-
-  public SketchCode(File file, Object metadata) {
-    init(file, metadata);
-  }
-
-  private void init(File file, Object metadata) {
     this.file = file;
-    this.metadata = metadata;
   }
 
   /**
@@ -244,14 +233,4 @@ public class SketchCode {
 
     BaseNoGui.saveFile(storage.getText(), newFile);
   }
-
-
-  public Object getMetadata() {
-    return metadata;
-  }
-
-
-  public void setMetadata(Object metadata) {
-    this.metadata = metadata;
-  }
 }