From 79b1c6ff930d63641590ea2dcf67747bca11edf4 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Tue, 20 Sep 2016 15:25:21 +0300 Subject: [PATCH] Restored "IgnoreSettingsType", "UnexpectedFormElementException" Deleted by mistake in d1e96fae4f4da833d1c9809670a3547d2e7f7002 --- .../UnexpectedFormElementException.java | 27 +++++++++++++++++++ .../vcs/changes/IgnoreSettingsType.java | 22 +++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java create mode 100644 platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoreSettingsType.java diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java new file mode 100644 index 000000000000..e557dd26fb31 --- /dev/null +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java @@ -0,0 +1,27 @@ +/* + * Copyright 2000-2016 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.uiDesigner.compiler; + +/** + * @author yole + */ +public class UnexpectedFormElementException extends RuntimeException { + + public UnexpectedFormElementException(String message) { + super(message); + } +} diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoreSettingsType.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoreSettingsType.java new file mode 100644 index 000000000000..e89a14371628 --- /dev/null +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoreSettingsType.java @@ -0,0 +1,22 @@ +/* + * 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.vcs.changes; + +public enum IgnoreSettingsType { + UNDER_DIR, + FILE, + MASK +}