move FolderStrategyType to right package
This commit is contained in:
parent
92d6e6604d
commit
06f03ea1e1
@ -1,9 +1,4 @@
|
||||
package de.marhali.easyi18n.model;
|
||||
|
||||
import de.marhali.easyi18n.io.folder.FolderStrategy;
|
||||
import de.marhali.easyi18n.io.folder.ModularLocaleFolderStrategy;
|
||||
import de.marhali.easyi18n.io.folder.ModularNamespaceFolderStrategy;
|
||||
import de.marhali.easyi18n.io.folder.SingleFolderStrategy;
|
||||
package de.marhali.easyi18n.io.folder;
|
||||
|
||||
/**
|
||||
* Represents all supported folder strategies.
|
@ -2,6 +2,7 @@ package de.marhali.easyi18n.io.parser;
|
||||
|
||||
import de.marhali.easyi18n.model.*;
|
||||
|
||||
import de.marhali.easyi18n.model.KeyPath;
|
||||
import de.marhali.easyi18n.settings.ProjectSettings;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@ -46,7 +47,7 @@ public abstract class ParserStrategy {
|
||||
|
||||
if(file.getNamespace() != null) {
|
||||
String moduleName = file.getNamespace();
|
||||
TranslationNode moduleNode = data.getNode(KeyPath.of(moduleName));
|
||||
TranslationNode moduleNode = data.getNode(new KeyPath(moduleName));
|
||||
|
||||
if(moduleNode == null) {
|
||||
moduleNode = new TranslationNode(this.settings.isSorting());
|
||||
@ -69,7 +70,7 @@ public abstract class ParserStrategy {
|
||||
TranslationNode targetNode = data.getRootNode();
|
||||
|
||||
if(file.getNamespace() != null) {
|
||||
targetNode = data.getNode(KeyPath.of(file.getNamespace()));
|
||||
targetNode = data.getNode(new KeyPath(file.getNamespace()));
|
||||
}
|
||||
|
||||
return Objects.requireNonNull(targetNode);
|
||||
|
@ -1,7 +1,7 @@
|
||||
package de.marhali.easyi18n.settings;
|
||||
|
||||
import de.marhali.easyi18n.io.parser.ParserStrategyType;
|
||||
import de.marhali.easyi18n.model.FolderStrategyType;
|
||||
import de.marhali.easyi18n.io.folder.FolderStrategyType;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
@ -4,7 +4,7 @@ import com.intellij.openapi.ui.ComboBox;
|
||||
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
|
||||
|
||||
import de.marhali.easyi18n.io.parser.ParserStrategyType;
|
||||
import de.marhali.easyi18n.model.FolderStrategyType;
|
||||
import de.marhali.easyi18n.io.folder.FolderStrategyType;
|
||||
import de.marhali.easyi18n.settings.presets.Preset;
|
||||
|
||||
import javax.swing.*;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package de.marhali.easyi18n.settings;
|
||||
|
||||
import de.marhali.easyi18n.io.parser.ParserStrategyType;
|
||||
import de.marhali.easyi18n.model.FolderStrategyType;
|
||||
import de.marhali.easyi18n.io.folder.FolderStrategyType;
|
||||
import de.marhali.easyi18n.settings.presets.DefaultPreset;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package de.marhali.easyi18n.settings.presets;
|
||||
|
||||
import de.marhali.easyi18n.io.parser.ParserStrategyType;
|
||||
import de.marhali.easyi18n.model.FolderStrategyType;
|
||||
import de.marhali.easyi18n.io.folder.FolderStrategyType;
|
||||
import de.marhali.easyi18n.settings.ProjectSettings;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
Loading…
x
Reference in New Issue
Block a user