M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-22 13:54:56 +03:00
parent 54a52a1e6e
commit 319e6575c8
8 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.idea/workspace.xml generated
View File

@@ -8,19 +8,12 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/VariantsForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -119,11 +112,11 @@
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
</key>
<key name="MoveMembersDialog.RECENTS_KEY">
<recent name="_VisualDVM.ProjectData.SapforData.Arrays.UI.ProjectArraysForm" />
<recent name="_VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm" />
<recent name="_VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm" />
<recent name="_VisualDVM.TestingSystem.Common.Group.UI.GroupsForm" />
<recent name="Common.CommonConstants" />
<recent name="Common.MainModule_" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\GlobalData\FileObject\UI" />

3
src/Common/Visual/DataSetControlForm.java
View File

@@ -71,7 +71,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
ex.printStackTrace();
}
}
System.out.println("found " + allFilters.size() + " filters for ui " + this.getClass().getSimpleName());
}
<M> Vector<M> getFilters(Class<M> f) {
Vector<M> res = new Vector<>();
@@ -421,7 +420,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
public boolean hasMenuBar() {
return true;
}
//-
//-found
public void SaveLastCurrent() {
savedCurrentKey = null;
savedSelectedKeys.clear();

6
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -22,12 +22,6 @@ import java.util.stream.Collectors;
public class ProjectArray extends DBObject {
//----------------------------------------------------------------------
public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
//-
public static String filterName = "";
public static String filterLocation = "";
public static String filterLocationName = "";
public static String filterFile = "";
public static String filterRegion = "*";
public String UniqKey;
public ArrayState State;
//-----------------------------

16
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java
View File

@@ -10,6 +10,12 @@ import _VisualDVM.Visual.Tables.RendererHyperlinks;
import javax.swing.*;
public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
//-
public static String filterName = "";
public static String filterLocation = "";
public static String filterLocationName = "";
public static String filterFile = "";
public static String filterRegion = "*";
public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -43,11 +49,11 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
public boolean isObjectVisible(ProjectArray object) {
if (super.isObjectVisible(object)) {
if (object.isTemplFlag > 0) return true;
return object.shortName.startsWith(object.filterName) &&
object.location.toString().startsWith(object.filterLocation) &&
object.locName.startsWith(object.filterLocationName) &&
object.has_decl_place(object.filterFile) &&
object.has_region(object.filterRegion);
return object.shortName.startsWith(filterName) &&
object.location.toString().startsWith(filterLocation) &&
object.locName.startsWith(filterLocationName) &&
object.has_decl_place(filterFile) &&
object.has_region(filterRegion);
}
return false;
}

2
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -18,7 +18,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
//todo упразднить и раскидать по стандартным фильтрам. галки и столбцы
public static String filterKey = "";
public static String filterSenderName = "";
public static String filterDescription = "";
public static String filterDescription = "";//ввести рендерер, чтобы значение столбца выдавало фулл описание и фильтр по столбцу работал
public static String filterComment = "";
public static String filterExecutor = "";
public static String filterVersion = "";

2
src/_VisualDVM/Visual/Interface/VariantsWindow.java
View File

@@ -9,8 +9,6 @@ public interface VariantsWindow extends VisualizerForm, FormWithSplitters {
void ShowNoVariantsFilter();
void ShowTotalVariantsCount();
void ShowFilteredVariantsCount();
void ShowCheckedVariantsCount();
void ShowNoCheckedVariantsCount();
void ShowNoFilteredVariantsCount();
void ShowNoTotalVariantsCount();
void ShowVariants();

32
src/_VisualDVM/Visual/Windows/ArraysForm.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.TextField.StyledTextField;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.ProjectArraysForm;
import _VisualDVM.Visual.Interface.ArraysWindow;
import javax.swing.*;
@@ -24,16 +24,16 @@ public class ArraysForm implements ArraysWindow {
Global.mainModule.getProject().declaratedArrays.mountUI(arraysPanel);
Global.mainModule.getProject().db.savedArrays.mountUI(savedArraysPanel);
//--
filterName.setText(ProjectArray.filterName);
filterName.setText(ProjectArraysForm.filterName);
filterName.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
ProjectArray.filterName = filterName.getText();
ProjectArraysForm.filterName = filterName.getText();
ShowArrays();
}
@Override
public void removeUpdate(DocumentEvent e) {
ProjectArray.filterName = filterName.getText();
ProjectArraysForm.filterName = filterName.getText();
ShowArrays();
}
@Override
@@ -41,16 +41,16 @@ public class ArraysForm implements ArraysWindow {
}
});
//-
filterLocation.setText(ProjectArray.filterLocation);
filterLocation.setText(ProjectArraysForm.filterLocation);
filterLocation.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
ProjectArray.filterLocation = filterLocation.getText();
ProjectArraysForm.filterLocation = filterLocation.getText();
ShowArrays();
}
@Override
public void removeUpdate(DocumentEvent e) {
ProjectArray.filterLocation = filterLocation.getText();
ProjectArraysForm.filterLocation = filterLocation.getText();
ShowArrays();
}
@Override
@@ -58,16 +58,16 @@ public class ArraysForm implements ArraysWindow {
}
});
//-
filterLocationName.setText(ProjectArray.filterLocationName);
filterLocationName.setText(ProjectArraysForm.filterLocationName);
filterLocationName.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
ProjectArray.filterLocationName = filterLocationName.getText();
ProjectArraysForm.filterLocationName = filterLocationName.getText();
ShowArrays();
}
@Override
public void removeUpdate(DocumentEvent e) {
ProjectArray.filterLocationName = filterLocationName.getText();
ProjectArraysForm.filterLocationName = filterLocationName.getText();
ShowArrays();
}
@Override
@@ -75,16 +75,16 @@ public class ArraysForm implements ArraysWindow {
}
});
//-
filterFile.setText(ProjectArray.filterFile);
filterFile.setText(ProjectArraysForm.filterFile);
filterFile.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
ProjectArray.filterFile = filterFile.getText();
ProjectArraysForm.filterFile = filterFile.getText();
ShowArrays();
}
@Override
public void removeUpdate(DocumentEvent e) {
ProjectArray.filterFile = filterFile.getText();
ProjectArraysForm.filterFile = filterFile.getText();
ShowArrays();
}
@Override
@@ -92,16 +92,16 @@ public class ArraysForm implements ArraysWindow {
}
});
//-
filterRegion.setText(ProjectArray.filterRegion);
filterRegion.setText(ProjectArraysForm.filterRegion);
filterRegion.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
ProjectArray.filterRegion = filterRegion.getText();
ProjectArraysForm.filterRegion = filterRegion.getText();
ShowArrays();
}
@Override
public void removeUpdate(DocumentEvent e) {
ProjectArray.filterRegion = filterRegion.getText();
ProjectArraysForm.filterRegion = filterRegion.getText();
ShowArrays();
}
@Override

8
src/_VisualDVM/Visual/Windows/VariantsForm.java
View File

@@ -85,10 +85,6 @@ public class VariantsForm implements VariantsWindow {
TotalVariantsCount.setText(String.valueOf(Global.mainModule.getProject().getTotalVariantsCount()));
}
@Override
public void ShowCheckedVariantsCount() {
// SelectedVariantsCount.setText(Current.getProject().CheckedVariantsCounter.toString());
}
@Override
public void ShowVariants() {
Global.mainModule.getProject().parallelVariants.ShowUI();
}
@@ -101,10 +97,6 @@ public class VariantsForm implements VariantsWindow {
Global.mainModule.getProject().parallelVariants.ClearUI();
}
@Override
public void ShowNoCheckedVariantsCount() {
//SelectedVariantsCount.setText("0");
}
@Override
public void ShowNoFilteredVariantsCount() {
VisibleVariantsCount.setText("0");
}