diff --git a/build.gradle b/build.gradle index 8a662de..0ed3b09 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'io.zhile.research.intellij' -version '1.0.0' +version '1.0.1' repositories { mavenCentral() diff --git a/src/main/java/io/zhile/research/intellij/MainComponent.java b/src/main/java/io/zhile/research/intellij/MainComponent.java index b5514ed..5b0332b 100644 --- a/src/main/java/io/zhile/research/intellij/MainComponent.java +++ b/src/main/java/io/zhile/research/intellij/MainComponent.java @@ -19,7 +19,7 @@ public class MainComponent implements ApplicationComponent { public void initComponent() { Preferences prefs = Preferences.userRoot().node(Constants.PLUGIN_NAME); - long lastResetTime = prefs.getLong(Constants.RESET_TIME_KEY, 0L); + long lastResetTime = prefs.getLong(Constants.PRODUCT_NAME + Constants.RESET_TIME_KEY, 0L); new Timer().schedule(new TimerTask() { diff --git a/src/main/java/io/zhile/research/intellij/action/ResetAction.java b/src/main/java/io/zhile/research/intellij/action/ResetAction.java index 5ca9cbd..da38728 100644 --- a/src/main/java/io/zhile/research/intellij/action/ResetAction.java +++ b/src/main/java/io/zhile/research/intellij/action/ResetAction.java @@ -4,7 +4,6 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.application.impl.ApplicationInfoImpl; @@ -27,10 +26,8 @@ public class ResetAction extends AnAction { private static final String OLD_MACHINE_ID_KEY = "JetBrains.UserIdOnMachine"; private static final String DEFAULT_COMPANY_NAME = "jetbrains"; - private static final String PRODUCT_NAME = ApplicationNamesInfo.getInstance().getProductName(); - public ResetAction() { - super("Reset " + PRODUCT_NAME + "'s Eval", "Reset my IDE eval information", AllIcons.General.Reset); + super("Reset " + Constants.PRODUCT_NAME + "'s Eval", "Reset my IDE eval information", AllIcons.General.Reset); } @Override @@ -54,7 +51,7 @@ public class ResetAction extends AnAction { prefs.remove(NEW_MACHINE_ID_KEY); prefs.remove(DEVICE_ID_KEY); - Preferences.userRoot().node(Constants.PLUGIN_NAME).put(Constants.RESET_TIME_KEY, Long.toString(System.currentTimeMillis())); + Preferences.userRoot().node(Constants.PLUGIN_NAME).put(Constants.PRODUCT_NAME + Constants.RESET_TIME_KEY, Long.toString(System.currentTimeMillis())); if (appInfo.isVendorJetBrains() && SystemInfo.isWindows) { String[] names = new String[]{"PermanentUserId", "PermanentDeviceId"}; diff --git a/src/main/java/io/zhile/research/intellij/helper/Constants.java b/src/main/java/io/zhile/research/intellij/helper/Constants.java index d6df1cc..4853cef 100644 --- a/src/main/java/io/zhile/research/intellij/helper/Constants.java +++ b/src/main/java/io/zhile/research/intellij/helper/Constants.java @@ -2,6 +2,7 @@ package io.zhile.research.intellij.helper; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.cl.PluginClassLoader; +import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.extensions.PluginId; public class Constants { @@ -9,6 +10,7 @@ public class Constants { public static final IdeaPluginDescriptor PLUGIN_DESCRIPTOR = CLASS_LOADER.getPluginDescriptor(); public static final PluginId PLUGIN_ID = CLASS_LOADER.getPluginId(); public static final String PLUGIN_NAME = PLUGIN_DESCRIPTOR == null ? "ide-eval-resetter" : PLUGIN_DESCRIPTOR.getName(); + public static final String PRODUCT_NAME = ApplicationNamesInfo.getInstance().getProductName(); public static final String RESET_TIME_KEY = "trail_reset_time"; }