diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionBean.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionBean.java deleted file mode 100644 index 4de847213103..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionBean.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.AbstractCollection; -import com.intellij.util.xmlb.annotations.Attribute; -import com.intellij.util.xmlb.annotations.Property; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag(ActionManagerImpl.ACTION_ELEMENT_NAME) -public class ActionBean { - @Attribute(ActionManagerImpl.ID_ATTR_NAME) - public String id; - - @Property(surroundWithTag = false) - @AbstractCollection(surroundWithTag = false) - public KeyboardShortcutBean[] keyboardShortcuts; - - @Property(surroundWithTag = false) - @AbstractCollection(surroundWithTag = false) - public AddToGroupBean[] addToGroups; - - @Attribute(ActionManagerImpl.CLASS_ATTR_NAME) - public String actionClass; - - @Attribute(ActionManagerImpl.ICON_ATTR_NAME) - public String icon; - - @Attribute(ActionManagerImpl.POPUP_ATTR_NAME) - public String isPopup; - - @Attribute(ActionManagerImpl.TEXT_ATTR_NAME) - public String text; - - @Attribute(ActionManagerImpl.INTERNAL_ATTR_NAME) - public boolean internal; - - @Attribute(ActionManagerImpl.USE_SHORTCUT_OF_ATTR_NAME) - public boolean useShortcutOf; - - @Attribute(ActionManagerImpl.KEYMAP_ATTR_NAME) - public String keymap; - - @Attribute(ActionManagerImpl.OVERRIDES_ATTR_NAME) - public boolean overrides; - - @Attribute(ActionManagerImpl.PROJECT_TYPE) - public String projectType; -} diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionGroupBean.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionGroupBean.java deleted file mode 100644 index 0bd75db34157..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionGroupBean.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.AbstractCollection; -import com.intellij.util.xmlb.annotations.Attribute; -import com.intellij.util.xmlb.annotations.Property; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag(ActionManagerImpl.GROUP_ELEMENT_NAME) -public class ActionGroupBean extends ActionBean { - @Property(surroundWithTag = false) - @AbstractCollection( - surroundWithTag = false, - elementTypes = {ActionBean.class, ActionGroupBean.class, ActionReferenceBean.class, SeparatorBean.class}) - public Object[] actions; - - @Attribute("test") - public String test; - - @Attribute("configurable") - public boolean configurable; - -} diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionManagerConfiguration.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionManagerConfiguration.java deleted file mode 100644 index a83a088a575c..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionManagerConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.AbstractCollection; -import com.intellij.util.xmlb.annotations.Tag; - -public class ActionManagerConfiguration { - @Tag(ActionManagerImpl.ACTIONS_ELEMENT_NAME) - @AbstractCollection( - surroundWithTag = false, - elementTypes = {ActionBean.class, ActionGroupBean.class, ActionReferenceBean.class}) - public Object[] actions; -} diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionReferenceBean.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionReferenceBean.java deleted file mode 100644 index 12b6f22c6e12..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionReferenceBean.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.Attribute; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag("reference") -public class ActionReferenceBean { - @Attribute(ActionManagerImpl.REF_ATTR_NAME) - public String ref; -} diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/AddToGroupBean.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/AddToGroupBean.java deleted file mode 100644 index 031295c8ccae..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/AddToGroupBean.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.Attribute; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag(ActionManagerImpl.ADD_TO_GROUP_ELEMENT_NAME) -public class AddToGroupBean { - - @Attribute(ActionManagerImpl.ANCHOR_ELEMENT_NAME) - public String anchor; - - @Attribute(ActionManagerImpl.GROUPID_ATTR_NAME) - public String groupId; - - @Attribute(ActionManagerImpl.RELATIVE_TO_ACTION_ATTR_NAME) - public String relativeToAction; -} diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/KeyboardShortcutBean.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/KeyboardShortcutBean.java deleted file mode 100644 index 055c00f1cd8a..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/KeyboardShortcutBean.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.Attribute; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag(ActionManagerImpl.SHORTCUT_ELEMENT_NAME) -public class KeyboardShortcutBean { - @Attribute(ActionManagerImpl.FIRST_KEYSTROKE_ATTR_NAME) - public String firstKeystroke; - - @Attribute(ActionManagerImpl.KEYMAP_ATTR_NAME) - public String keymap; -} diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/SeparatorBean.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/SeparatorBean.java deleted file mode 100644 index bf9544daf539..000000000000 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/SeparatorBean.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2009 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 com.intellij.openapi.actionSystem.impl.config; - -import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag(ActionManagerImpl.SEPARATOR_ELEMENT_NAME) -public class SeparatorBean { -} diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index d93527306130..1375a2b60516 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -370,7 +370,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -506,7 +506,7 @@ - +