diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/ConflictOperation.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/ConflictOperation.java | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/ConflictOperation.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/ConflictOperation.java new file mode 100644 index 000000000000..d0936a538945 --- /dev/null +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/ConflictOperation.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 org.jetbrains.idea.svn.conflict; + +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; + +/** + * @author Konstantin Kolosovsky. + */ +public enum ConflictOperation { + NONE, + UPDATE, + SWITCH, + MERGE; + + @NotNull + public static ConflictOperation from(@NotNull @NonNls String operationName) { + return valueOf(ConflictOperation.class, operationName.toUpperCase()); + } + + @Override + @NonNls + public String toString() { + return super.toString().toLowerCase(); + } +} |