Index: gbif-api/src/main/java/org/gbif/api/model/registry/Dataset.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- gbif-api/src/main/java/org/gbif/api/model/registry/Dataset.java	(revision 1082)
+++ gbif-api/src/main/java/org/gbif/api/model/registry/Dataset.java	(revision )
@@ -27,6 +27,7 @@
 import org.gbif.api.model.registry.taxonomic.TaxonomicCoverages;
 import org.gbif.api.model.registry.temporal.TemporalCoverage;
 import org.gbif.api.vocabulary.ContactType;
+import org.gbif.api.vocabulary.DatasetType;
 import org.gbif.api.vocabulary.EndpointType;
 import org.gbif.api.vocabulary.IdentifierType;
 import org.gbif.api.vocabulary.Language;
@@ -40,6 +41,7 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
 
 
@@ -54,7 +56,6 @@
   private NetworkEntityComponentSupport components = new NetworkEntityComponentSupport();
 
   private boolean constituents;
-  private boolean registered;
   private NetworkOfOrigin networkOfOrigin;
   private List<Citation> bibliographicCitations = Lists.newArrayList();
   private List<CuratorialUnitComposite> curatorialUnits = Lists.newArrayList();
@@ -65,8 +66,6 @@
   private List<KeywordCollection> keywordCollections = Lists.newArrayList();
   private Project project;
   private SamplingDescription samplingDescription;
-  private boolean dataAvailable;
-  private boolean dataIndexable;
   private List<String> isoCountryCodes = Lists.newArrayList(); // covered by the dataset
   private List<Collection> collections;
   private List<DataDescription> dataDescriptions;
@@ -88,7 +87,6 @@
     super(builder);
     this.components = builder.componentBuilder.build();
     this.constituents = builder.constituents;
-    this.registered = builder.registered;
     this.networkOfOrigin = builder.networkOfOrigin;
     this.bibliographicCitations = builder.bibliographicCitations;
     this.curatorialUnits = builder.curatorialUnits;
@@ -99,8 +97,6 @@
     this.keywordCollections = builder.keywordCollections;
     this.project = builder.project;
     this.samplingDescription = builder.samplingDescription;
-    this.dataAvailable = builder.dataAvailable;
-    this.dataIndexable = builder.dataIndexable;
     this.isoCountryCodes = builder.isoCountryCodes;
     this.pubDate = builder.pubDate;
     this.additionalInfo = builder.additionalInfo;
@@ -320,34 +316,13 @@
   }
 
   /**
-   * Note: Currently we cannot detect this and all datasets with an indexable service are true!
-   *
-   * @return true if the data from this dataset has been indexed by and is available from GBIF.
+   * @return true if dataset is explicitly registered with GBIF, has a UUID key and is no external metadata only dataset
    */
-  public boolean isDataAvailable() {
-    return dataAvailable;
-  }
-
-  public void setDataAvailable(boolean dataAvailable) {
-    this.dataAvailable = dataAvailable;
-  }
-
-  public boolean isDataIndexable() {
-    return dataIndexable;
-  }
-
-  public void setDataIndexable(boolean dataIndexable) {
-    this.dataIndexable = dataIndexable;
-  }
-
+  @JsonIgnore
   public boolean isRegistered() {
-    return registered;
+    return DatasetType.METADATA != getType();
   }
 
-  public void setRegistered(boolean registered) {
-    this.registered = registered;
-  }
-
   @Override
   public List<Contact> getContacts() {
     return components.getContacts();
@@ -463,8 +438,7 @@
     }
 
     Dataset that = (Dataset) object;
-    return Objects.equal(this.registered, that.registered)
-           && Objects.equal(this.constituents, that.constituents)
+    return Objects.equal(this.constituents, that.constituents)
            && Objects.equal(this.networkOfOrigin, that.networkOfOrigin)
            && Objects.equal(this.bibliographicCitations, that.bibliographicCitations)
            && Objects.equal(this.curatorialUnits, that.curatorialUnits)
@@ -475,8 +449,6 @@
            && Objects.equal(this.keywordCollections, that.keywordCollections)
            && Objects.equal(this.project, that.project)
            && Objects.equal(this.samplingDescription, that.samplingDescription)
-           && Objects.equal(this.dataAvailable, that.dataAvailable)
-           && Objects.equal(this.dataIndexable, that.dataIndexable)
            && Objects.equal(this.pubDate, that.pubDate)
            && Objects.equal(this.additionalInfo, that.additionalInfo)
            && Objects.equal(this.purpose, that.purpose)
@@ -491,7 +463,6 @@
   public int hashCode() {
     return Objects.hashCode(super.hashCode(),
                             components,
-                            registered,
                             constituents,
                             networkOfOrigin,
                             bibliographicCitations,
@@ -503,8 +474,6 @@
                             keywordCollections,
                             project,
                             samplingDescription,
-                            dataAvailable,
-                            dataIndexable,
                             isoCountryCodes,
                             pubDate,
                             purpose,
@@ -522,7 +491,6 @@
       .add("super", super.toString())
       .add("components", components.toString())
       .add("serialVersionUID", serialVersionUID)
-      .add("registered", registered)
       .add("constituents", constituents)
       .add("networkOfOrigin", networkOfOrigin)
       .add("bibliographicCitations", bibliographicCitations)
@@ -534,8 +502,6 @@
       .add("keywordCollections", keywordCollections)
       .add("project", project)
       .add("samplingDescription", samplingDescription)
-      .add("dataAvailable", dataAvailable)
-      .add("dataIndexable", dataIndexable)
       .add("isoCountryCodes", isoCountryCodes)
       .add("pubDate", pubDate)
       .add("purpose", purpose)
