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:06:47 +03:00
parent b696af952f
commit fc6282cd22
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -7,7 +7,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -347,7 +347,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
protected boolean ApplyFilters(D object) { protected boolean ApplyFilters(D object) {
for (DBObjectFilter_ filterInterface : allFilters) { for (DBObjectFilter_ filterInterface : allFilters) {
if (!filterInterface.Validate(object)) //?? if (!filterInterface.Validate(object))
return false; return false;
} }
return true; return true;

3
src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java
View File

@@ -75,7 +75,6 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) && MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
Global.mainModule.HasProject() && Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject()) && object.belongsToProject(Global.mainModule.getProject()) &&
Global.mainModule.HasCompilationTask() && MainModule_.instance.matchCurrentID(Current.CompilationTask, object.compilation_task_id);
object.compilation_task_id == Global.mainModule.getCompilationTask().id;
} }
} }

7
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -18,8 +18,6 @@ import javax.swing.*;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> { public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) { public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} }
@@ -147,9 +145,4 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
} }
}; };
} }
@Override
public boolean isObjectVisible(DVMPackage object) {
return super.isObjectVisible(object) && (!filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!filterActive || object.state.isActive());
}
} }