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-20 21:59:39 +03:00
parent 99643aa755
commit fda2940a79
95 changed files with 872 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;
@@ -69,28 +68,4 @@ public class BugReport extends rDBObject {
commentAdditionDraft = b.commentAdditionDraft;
owner = b.owner;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
//todo выкинуть этот интерфейс. бессмысленный
return BugReportInterface.getDescriptionHeader(this);
case 2:
return sender_name;
case 3:
return executor;
case 4:
return project_version;
case 5:
return percentage;
case 6:
return getDate();
case 7:
return getChangeDate();
case 8:
return state;
default:
return null;
}
}
}

1
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
import javax.swing.*;
import java.util.Comparator;
import java.util.Vector;
import java.util.stream.Collectors;
public class BugReportsDBTable extends DBTable<String, BugReport> {

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

@@ -84,6 +84,30 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
}
@Override
public boolean isObjectVisible(BugReport object) {
return super.isObjectVisible(object)&&BugReportInterface.isVisible(object);
return super.isObjectVisible(object) && BugReportInterface.isVisible(object);
}
@Override
public Object getFieldAt(BugReport object, int columnIndex) {
switch (columnIndex) {
case 1:
//todo выкинуть этот интерфейс. бессмысленный
return BugReportInterface.getDescriptionHeader(object);
case 2:
return object.sender_name;
case 3:
return object.executor;
case 4:
return object.project_version;
case 5:
return object.percentage;
case 6:
return object.getDate();
case 7:
return object.getChangeDate();
case 8:
return object.state;
default:
return null;
}
}
}

17
src/_VisualDVM/Repository/Component/Component.java
View File

@@ -132,21 +132,4 @@ public abstract class Component extends DBObject implements Loggable {
public boolean isNecessary() {
return true;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return getComponentType().getDescription();
case 3:
return version;
case 4:
return actual_version;
case 5:
return date_text;
case 6:
return getState();
default:
return null;
}
}
}

17
src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
View File

@@ -30,6 +30,23 @@ public class ComponentsForm extends DataSetControlForm<Component> {
"Статус"};
}
@Override
public Object getFieldAt(Component object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getComponentType().getDescription();
case 3:
return object.version;
case 4:
return object.actual_version;
case 5:
return object.date_text;
case 6:
return object.getState();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererMaskedNanInteger.class);

13
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java
View File

@@ -1,22 +1,9 @@
package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
public class SubscriberWorkspace extends iDBObject {
public String email; //почта
public String URL; //адрес:порт машины
public String login; // имя пользователя
public String path; //рабочая папка на машине
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return URL;
case 2:
return login;
case 3:
return path;
}
return null;
}
}

3
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -2,10 +2,9 @@ package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.UI.SubscriberWorkspacesForm;
import javax.swing.*;
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {

17
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesForm.java → src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -1,9 +1,10 @@
package _VisualDVM.Repository.SubscriberWorkspace;
package _VisualDVM.Repository.SubscriberWorkspace.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
@@ -18,12 +19,24 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
"папка"};
}
@Override
public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.URL;
case 2:
return object.login;
case 3:
return object.path;
}
return null;
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
@Override
public boolean isObjectVisible(SubscriberWorkspace object) {
return super.isObjectVisible(object)&&Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
return super.isObjectVisible(object) && Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
(Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
}
}

12
src/_VisualDVM/Repository/Subscribes/Subscriber.java
View File

@@ -36,16 +36,4 @@ public class Subscriber extends DBObject {
public Object getEmptyFK() {
return "";
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return name;
case 3:
return role.getDescription();
case 4:
return (mailOn == 0) ? "выключена" : "включена";
}
return name;
}
}

12
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
View File

@@ -24,6 +24,18 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
"Рассылка"};
}
@Override
public Object getFieldAt(Subscriber object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.name;
case 3:
return object.role.getDescription();
case 4:
return (object.mailOn == 0) ? "выключена" : "включена";
}
return object.name;
}
@Override
protected void AdditionalInitColumns() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
columns.get(0).setVisible(admin);