From e251a7d37b7fe3a5b9930e55d4f21bd31aae3978 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Thu, 28 Feb 2013 13:17:00 +0400
Subject: [PATCH] IDEA-95898 Gradle based projects should offer Auto-Import as
 Maven projects do

Remove unnecessary use change ttl processing
---
 .../AbstractGradleUserProjectChange.java       | 16 ----------------
 .../autoimport/GradleUserProjectChange.java    | 10 ----------
 .../GradleUserProjectChangesCalculator.java    |  5 +----
 .../gradle/config/GradleLocalSettings.java     | 18 ------------------
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/AbstractGradleUserProjectChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/AbstractGradleUserProjectChange.java
index bd40b71a176d..c866777b2927 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/AbstractGradleUserProjectChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/AbstractGradleUserProjectChange.java
@@ -24,12 +24,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public abstract class AbstractGradleUserProjectChange<T extends AbstractGradleUserProjectChange> implements GradleUserProjectChange<T> {
   
-  private long myTimestamp;
-
-  protected AbstractGradleUserProjectChange() {
-    myTimestamp = System.currentTimeMillis();
-  }
-
   @SuppressWarnings("unchecked")
   @Nullable
   @Override
@@ -41,14 +35,4 @@ public abstract class AbstractGradleUserProjectChange<T extends AbstractGradleUs
   public void loadState(T state) {
     XmlSerializerUtil.copyBean(state, this); 
   }
-
-  @Override
-  public long getTimestamp() {
-    return myTimestamp;
-  }
-
-  @Override
-  public void setTimestamp(long timestamp) {
-    myTimestamp = timestamp;
-  }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChange.java
index c289102310ff..4fc50777f30f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChange.java
@@ -31,14 +31,4 @@ import org.jetbrains.annotations.NotNull;
 public interface GradleUserProjectChange<T extends GradleUserProjectChange> extends PersistentStateComponent<T>, Comparable<T> {
 
   void invite(@NotNull GradleUserProjectChangeVisitor visitor);
-
-  /**
-   * @return    timestamp of the last known point when current change was not outdated. This information is useful
-   *            if we want to return a change if it was inactive for a while (e.g. a user temporarily added a module and after
-   *            that project files are re-written on update from VCS. We don't want to keep the change forever then)
-   */
-  long getTimestamp();
-  
-  @SuppressWarnings("UnusedDeclaration") // Used by IJ serialization
-  void setTimestamp(long timestamp);
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java
index d784448964ea..316d87aa4e0b 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java
@@ -137,10 +137,7 @@ public class GradleUserProjectChangesCalculator {
   public void filterOutdatedChanges() {
     Set<GradleUserProjectChange> changes = ContainerUtilRt.newHashSet(mySettings.getUserProjectChanges());
     for (GradleUserProjectChange change : mySettings.getUserProjectChanges()) {
-      if (isUpToDate(change)) {
-        change.setTimestamp(System.currentTimeMillis());
-      }
-      else {
+      if (!isUpToDate(change)) {
         changes.remove(change);
       }
     }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleLocalSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleLocalSettings.java
index c817e257c9cf..08a228563536 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleLocalSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleLocalSettings.java
@@ -3,7 +3,6 @@ package org.jetbrains.plugins.gradle.config;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.SystemProperties;
-import com.intellij.util.containers.ContainerUtilRt;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.AbstractCollection;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +13,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -26,8 +24,6 @@ import java.util.concurrent.atomic.AtomicReference;
 @State(name = "GradleLocalSettings", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)} )
 public class GradleLocalSettings implements PersistentStateComponent<GradleLocalSettings> {
 
-  private static final long USER_CHANGE_TTL_MS = SystemProperties.getIntProperty("gradle.user.change.ttl", (int)TimeUnit.DAYS.toMillis(7));
-
   private static final boolean PRESERVE_EXPAND_STATE = !SystemProperties.getBooleanProperty("gradle.forget.expand.nodes.state", false);
 
   /** Holds changes confirmed by the end-user. */
@@ -57,20 +53,6 @@ public class GradleLocalSettings implements PersistentStateComponent<GradleLocal
   @Override
   public void loadState(GradleLocalSettings state) {
     XmlSerializerUtil.copyBean(state, this);
-    Set<GradleUserProjectChange> activeChange = ContainerUtilRt.newHashSet();
-    boolean update = false;
-    long now = System.currentTimeMillis();
-    for (GradleUserProjectChange change : getUserProjectChanges()) {
-      if (now - change.getTimestamp() > USER_CHANGE_TTL_MS) {
-        update = true;
-      }
-      else {
-        activeChange.add(change);
-      }
-    }
-    if (update) {
-      setUserProjectChanges(activeChange);
-    }
   }
 
   @SuppressWarnings("UnusedDeclaration")