MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

deprecate RoamingTypeExtensionPoint

Browse Source
This commit is contained in:
Vladimir Krivosheev
2013-09-18 11:34:48 +02:00
parent 09faeb925c
commit fdec7af717
9 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/util/ProjectPropertiesComponentImpl.java
+2
View File
@@ -15,12 +15,14 @@
*/
package com.intellij.ide.util;
import com.intellij.openapi.components.RoamingType;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.components.StoragePathMacros;
@State(
name = "PropertiesComponent",
roamingType = RoamingType.DISABLED,
storages = {@Storage(
file = StoragePathMacros.WORKSPACE_FILE)})
public class ProjectPropertiesComponentImpl extends PropertiesComponentImpl {
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/RoamingTypeExtensionPointBean.java
+4
View File
@@ -17,6 +17,10 @@ package com.intellij.openapi.components.impl.stores;
import com.intellij.util.xmlb.annotations.Attribute;
/**
* @deprecated use {@link com.intellij.openapi.components.RoamingType#DISABLED}
*/
@Deprecated
public class RoamingTypeExtensionPointBean {
@Attribute("component")
public String componentName;
platform/platform-resources/src/META-INF/PlatformExtensions.xml
-1
View File
@@ -241,7 +241,6 @@
<editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.hint.EscapeHandler" id="hide-hints"/>
<ComponentRoamingType component="ChangeListManager" type="DISABLED"/>
<ComponentRoamingType component="RestoreUpdateTree" type="DISABLED"/>
<ComponentRoamingType component="PropertiesComponent" type="DISABLED"/>
<projectConfigurable instance="com.intellij.javaee.ExternalResourceConfigurable" key="display.name.edit.external.resource"
bundle="messages.XmlBundle" id="preferences.externalResources">
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerSerialization.java
+5 -5
View File
@@ -55,11 +55,11 @@ class ChangeListManagerSerialization {
@SuppressWarnings({"unchecked"})
public void readExternal(final Element element) throws InvalidDataException {
final List<Element> listNodes = (List<Element>)element.getChildren(NODE_LIST);
final List<Element> listNodes = element.getChildren(NODE_LIST);
for (Element listNode : listNodes) {
readChangeList(listNode);
}
final List<Element> ignoredNodes = (List<Element>)element.getChildren(NODE_IGNORED);
final List<Element> ignoredNodes = element.getChildren(NODE_IGNORED);
for (Element ignoredNode: ignoredNodes) {
readFileToIgnore(ignoredNode);
}
@@ -74,7 +74,7 @@ class ChangeListManagerSerialization {
null);
}
//noinspection unchecked
final List<Element> changeNodes = (List<Element>)listNode.getChildren(NODE_CHANGE);
final List<Element> changeNodes = listNode.getChildren(NODE_CHANGE);
for (Element changeNode : changeNodes) {
try {
myWorker.addChangeToList(changeListName, readChange(changeNode), null);
@@ -84,10 +84,10 @@ class ChangeListManagerSerialization {
}
}
if (ChangeListManagerSerialization.ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_DEFAULT))) {
if (ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_DEFAULT))) {
myWorker.setDefault(list.getName());
}
if (ChangeListManagerSerialization.ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_READONLY))) {
if (ATT_VALUE_TRUE.equals(listNode.getAttributeValue(ATT_READONLY))) {
list.setReadOnly(true);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/update/RestoreUpdateTree.java
+8
View File
@@ -41,8 +41,10 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable {
myProject = project;
}
@Override
public void projectOpened() {
StartupManager.getInstance(myProject).registerPostStartupActivity(new DumbAwareRunnable() {
@Override
public void run() {
if (myUpdateInfo != null && !myUpdateInfo.isEmpty() && ProjectReloadState.getInstance(myProject).isAfterAutomaticReload()) {
ActionInfo actionInfo = myUpdateInfo.getActionInfo();
@@ -61,20 +63,25 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable {
});
}
@Override
public void projectClosed() {
}
@Override
@NotNull
public String getComponentName() {
return "RestoreUpdateTree";
}
@Override
public void initComponent() { }
@Override
public void disposeComponent() {
}
@Override
public void readExternal(Element element) throws InvalidDataException {
Element child = element.getChild(UPDATE_INFO);
if (child != null) {
@@ -84,6 +91,7 @@ public class RestoreUpdateTree implements ProjectComponent, JDOMExternalizable {
}
}
@Override
public void writeExternal(Element element) throws WriteExternalException {
if (myUpdateInfo != null) {
Element child = new Element(UPDATE_INFO);
plugins/git4idea/src/META-INF/plugin.xml
-1
View File
@@ -166,7 +166,6 @@
<applicationService serviceInterface="git4idea.DialogManager"
serviceImplementation="git4idea.DialogManager" />
<ComponentRoamingType component="Git.Settings" type="DISABLED"/>
<fileTypeFactory implementation="git4idea.vfs.GitFileTypeFactory"/>
<vcs.taskHandler implementation="git4idea.GitTaskHandler"/>
</extensions>
plugins/git4idea/src/git4idea/config/GitVcsSettings.java
+2 -5
View File
@@ -16,10 +16,7 @@
package git4idea.config;
import com.intellij.lifecycle.PeriodicalTasksCloser;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.components.StoragePathMacros;
import com.intellij.openapi.components.*;
import com.intellij.openapi.project.Project;
import com.intellij.util.ArrayUtil;
import git4idea.ui.branch.GitBranchSyncSetting;
@@ -34,7 +31,7 @@ import java.util.Map;
/**
* Git VCS settings
*/
@State(name = "Git.Settings", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)})
@State(name = "Git.Settings", roamingType = RoamingType.DISABLED, storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE)})
public class GitVcsSettings implements PersistentStateComponent<GitVcsSettings.State> {
private static final int PREVIOUS_COMMIT_AUTHORS_LIMIT = 16; // Limit for previous commit authors
plugins/svn4idea/src/META-INF/plugin.xml
-2
View File
@@ -138,8 +138,6 @@
serviceImplementation="org.jetbrains.idea.svn.dialogs.browserCache.CacheLoader"/>
<vcs name="svn" vcsClass="org.jetbrains.idea.svn.SvnVcs" displayName="Subversion" administrativeAreaName=".svn, _svn" crawlUpToCheckUnderVcs="true"/>
<ComponentRoamingType component="SvnConfiguration" type="DISABLED"/>
<vcsPopupProvider implementation="org.jetbrains.idea.svn.actions.SvnQuickListContentProvider"/>
</extensions>
</idea-plugin>
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
+1
View File
@@ -62,6 +62,7 @@ import java.util.*;
@State(
name = "SvnConfiguration",
roamingType = RoamingType.DISABLED,
storages = {
@Storage(
file = StoragePathMacros.WORKSPACE_FILE