Skip to content

Commit 1bf199b

Browse files
committed
Update jars and add new project resources
1 parent 63d837d commit 1bf199b

File tree

6 files changed

+14
-30
lines changed

6 files changed

+14
-30
lines changed
490 KB
Binary file not shown.
File renamed without changes.

swan_assist/src/de/fraunhofer/iem/swan/assist/ui/SummaryToolWindow.java

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,17 @@
33
import com.intellij.openapi.actionSystem.ActionManager;
44
import com.intellij.openapi.actionSystem.ActionToolbar;
55
import com.intellij.openapi.actionSystem.DefaultActionGroup;
6-
import com.intellij.openapi.editor.Document;
7-
import com.intellij.openapi.fileEditor.FileDocumentManager;
8-
import com.intellij.openapi.fileEditor.FileEditorManager;
96
import com.intellij.openapi.project.Project;
10-
import com.intellij.openapi.vfs.VirtualFile;
117
import com.intellij.openapi.wm.ToolWindow;
128
import com.intellij.openapi.wm.ToolWindowFactory;
139
import com.intellij.ui.components.JBPanel;
1410
import com.intellij.ui.components.JBScrollPane;
1511
import com.intellij.ui.content.Content;
1612
import com.intellij.ui.content.ContentFactory;
17-
import de.fraunhofer.iem.swan.assist.util.Formatter;
1813
import org.jetbrains.annotations.NotNull;
1914

15+
import javax.swing.*;
2016
import java.awt.*;
21-
import java.util.ArrayList;
2217

2318
/**
2419
* Tool Window implementation for the Plugin.
@@ -28,12 +23,6 @@
2823

2924
public class SummaryToolWindow implements ToolWindowFactory {
3025

31-
private String currentFile;
32-
public static ArrayList<String> TREE_FILTERS;
33-
public static boolean CURRENT_FILE_FILTER;
34-
public static boolean RESTORE_METHOD;
35-
public static boolean CURRENT_PROJECT_FILTER;
36-
3726
@Override
3827
public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
3928

@@ -42,17 +31,14 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
4231
//Toolbar action panel
4332
final DefaultActionGroup actions = (DefaultActionGroup) ActionManager.getInstance().getAction("SWAN_Assist.ActionBar");
4433
final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("SummaryToolbar", actions, true);
45-
toolPanel.add(actionToolbar.getComponent(), BorderLayout.PAGE_START);
46-
47-
TREE_FILTERS = new ArrayList<>();
48-
CURRENT_FILE_FILTER = false;
49-
RESTORE_METHOD = false;
50-
CURRENT_PROJECT_FILTER = false;
5134

52-
//TODO exception when no file is open
53-
Document document = FileEditorManager.getInstance(project).getSelectedTextEditor().getDocument();
54-
VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(document);
55-
currentFile = Formatter.getFileNameFromPath(virtualFile.getName());
35+
if(toolWindow.getAnchor().isHorizontal()){
36+
actionToolbar.setOrientation(SwingConstants.VERTICAL);
37+
toolPanel.add(actionToolbar.getComponent(), BorderLayout.LINE_START);
38+
}else{
39+
actionToolbar.setOrientation(SwingConstants.HORIZONTAL);
40+
toolPanel.add(actionToolbar.getComponent(), BorderLayout.PAGE_START);
41+
}
5642

5743
//Add method list tree to tool window
5844
toolPanel.add(new JBScrollPane(new MethodListTree(project)), BorderLayout.CENTER);

swan_assist/src/de/fraunhofer/iem/swan/assist/util/Formatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.fraunhofer.iem.swan.assist.util;
22

3-
import org.apache.commons.lang.StringUtils;
3+
import org.apache.commons.lang3.StringUtils;
44
import de.fraunhofer.iem.swan.data.Method;
55

66
import java.util.List;
@@ -12,7 +12,7 @@
1212

1313
public class Formatter {
1414

15-
public static String capitalizeFirstCharacter(String text){
15+
public static String toTitleCase(String text){
1616

1717
return text.substring(0,1).toUpperCase()+text.substring(1);
1818
}

swan_assist/src/de/fraunhofer/iem/swan/assist/util/PsiTraversal.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import com.intellij.psi.util.PsiTypesUtil;
1111
import de.fraunhofer.iem.swan.assist.data.JSONFileLoader;
1212
import de.fraunhofer.iem.swan.assist.data.MethodWrapper;
13-
import org.apache.commons.lang.StringUtils;
14-
13+
import org.apache.commons.lang3.StringUtils;
1514
import java.util.ArrayList;
1615
import java.util.List;
1716

@@ -22,7 +21,7 @@
2221
*/
2322
public class PsiTraversal {
2423

25-
public static List<String> getParameters(PsiMethod psiMethod) {
24+
private static List<String> getParameters(PsiMethod psiMethod) {
2625

2726
List<String> parameters = new ArrayList<String>();
2827
for (PsiParameter psiParameter : psiMethod.getParameterList().getParameters()) {
@@ -33,10 +32,10 @@ public static List<String> getParameters(PsiMethod psiMethod) {
3332
parameters.add(psiClass.getQualifiedName());
3433
} else if (psiParameter.getType() instanceof PsiArrayType) {
3534

36-
3735
PsiArrayType psiArrayType = (PsiArrayType) psiParameter.getType();
3836
parameters.add(psiArrayType.getCanonicalText());
3937
} else
38+
4039
parameters.add(psiParameter.getType().getCanonicalText());
4140

4241
}

swan_assist/src/icons/IconUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import com.intellij.openapi.util.IconLoader;
44
import de.fraunhofer.iem.swan.data.Constants;
5-
import org.apache.commons.lang.StringUtils;
6-
5+
import org.apache.commons.lang3.StringUtils;
76
import javax.swing.*;
87
import java.util.ArrayList;
98
import java.util.Collections;

0 commit comments

Comments
 (0)