Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784

1 files changed, 40 insertions, 0 deletions

diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityState.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityState.java
new file mode 100644
index 000000000000..2aefde070af7
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityState.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2014 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.profile.codeInspection.ui.table;
+
+import com.intellij.lang.annotation.HighlightSeverity;
+
+/**
+ * @author Dmitry Batkovich
+ */
+public class SeverityState {
+
+  private final HighlightSeverity mySeverity;
+  private final boolean myEnabledForEditing;
+
+  public SeverityState(HighlightSeverity severity, boolean enabledForEditing) {
+    mySeverity = severity;
+    myEnabledForEditing = enabledForEditing;
+  }
+
+  public HighlightSeverity getSeverity() {
+    return mySeverity;
+  }
+
+  public boolean isEnabledForEditing() {
+    return myEnabledForEditing;
+  }
+}