diff options
Diffstat (limited to 'images')
| -rw-r--r-- | images/src/icons/ImagesIcons.java | 19 | ||||
| -rw-r--r-- | images/src/org/intellij/images/options/impl/OptionsManagerImpl.java | 12 |
2 files changed, 23 insertions, 8 deletions
diff --git a/images/src/icons/ImagesIcons.java b/images/src/icons/ImagesIcons.java index de9578ec6e17..9baeb08d1e06 100644 --- a/images/src/icons/ImagesIcons.java +++ b/images/src/icons/ImagesIcons.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package icons; import com.intellij.openapi.util.IconLoader; @@ -5,8 +20,8 @@ import com.intellij.openapi.util.IconLoader; import javax.swing.*; /** - * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant - * Don't repeat mistakes of others ;-) + * NOTE THIS FILE IS AUTO-GENERATED + * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead */ public class ImagesIcons { private static Icon load(String path) { diff --git a/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java index f1a1774b80f0..50edd78feab0 100644 --- a/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java +++ b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java @@ -15,12 +15,8 @@ */ package org.intellij.images.options.impl; -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.util.InvalidDataException; -import com.intellij.openapi.util.RoamingTypeDisabled; import com.intellij.openapi.util.WriteExternalException; import org.intellij.images.options.Options; import org.intellij.images.options.OptionsManager; @@ -33,17 +29,20 @@ import org.jdom.Element; */ @State( name = "Images.OptionsManager", + roamingType = RoamingType.DISABLED, storages = { @Storage(file = StoragePathMacros.APP_CONFIG + "/images.support.xml") } ) -final class OptionsManagerImpl extends OptionsManager implements PersistentStateComponent<Element>, RoamingTypeDisabled { +final class OptionsManagerImpl extends OptionsManager implements PersistentStateComponent<Element> { private final OptionsImpl options = new OptionsImpl(); + @Override public Options getOptions() { return options; } + @Override public Element getState() { Element element = new Element("state"); try { @@ -55,6 +54,7 @@ final class OptionsManagerImpl extends OptionsManager implements PersistentState return element; } + @Override public void loadState(final Element state) { try { options.readExternal(state); |