From 5b0691ea09a1aff4a0b0c38fc2c94b83e0891ef7 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:11:39 +0300 Subject: [PATCH 01/29] updated lib version --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 0d1c31c..15d8775 100644 --- a/pom.xml +++ b/pom.xml @@ -19,20 +19,20 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.116.100 - 3.4.2 - 3.13.0 - 3.3.0 - 3.7.1 + 3.128.0 + 3.5.1 + 3.15.0 + 3.5.6 + 3.8.0 2.0.1 4.13.2 - 2.23.0 - 3.21.0 - 42.7.3 - 1.4.3 - 3.9.600 - 3.10.600 - 1.19.8 + 2.26.1 + 3.33.0 + 42.7.13 + 1.4.9 + 3.12.500 + 3.20.400 + 1.21.4 From 16a87e948b83c8c4bf6896ab60c0eab698727060 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:14:42 +0300 Subject: [PATCH 02/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15d8775..e00cfe6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.128.0 + 3.127.0 3.5.1 3.15.0 3.5.6 From 9e096e5c9e16c8835148a460644549f2ea9bd5ec Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:15:40 +0300 Subject: [PATCH 03/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e00cfe6..75fd6d0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.127.0 + 3.126.0 3.5.1 3.15.0 3.5.6 From 9878d42911867f7ca210d9705bbde31434d72462 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:17:41 +0300 Subject: [PATCH 04/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75fd6d0..97f8e7c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.126.0 + 3.125.0 3.5.1 3.15.0 3.5.6 From bea8d06b54cd4b9ba80619231bf8ea8736dd2b1c Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:19:14 +0300 Subject: [PATCH 05/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97f8e7c..56800e2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.125.0 + 3.124.200 3.5.1 3.15.0 3.5.6 From 5fb43ef4bf74cb91c42f29f33949cdc4ef4d7c14 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:20:45 +0300 Subject: [PATCH 06/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56800e2..b78a944 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.124.200 + 3.124.100 3.5.1 3.15.0 3.5.6 From ccb03294f99090d8ff0b964c70af733685901a81 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:22:12 +0300 Subject: [PATCH 07/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b78a944..fa010e0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.124.100 + 3.124.0 3.5.1 3.15.0 3.5.6 From 31cb1eb1adfec4e695fa23257e93e29d0c8676fe Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:24:19 +0300 Subject: [PATCH 08/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa010e0..56f100e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.124.0 + 3.118.0 3.5.1 3.15.0 3.5.6 From 76bcbb4894290a0acf7d5c52240c9c3f229778c6 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:25:30 +0300 Subject: [PATCH 09/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56f100e..6621264 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.118.0 + 3.117.0 3.5.1 3.15.0 3.5.6 From 4a3980a3e65fb2c85d33a13756873ba220321a9a Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:26:16 +0300 Subject: [PATCH 10/29] downgrade swt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6621264..c1f77c2 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.swt.gtk.linux.x86_64 Linux-x86_64 - 3.117.0 + 3.116.100 3.5.1 3.15.0 3.5.6 From 239f0e871e348ddc0b0a729a5e4da739777e3ae1 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:28:57 +0300 Subject: [PATCH 11/29] downgrade jface --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1f77c2..a58680b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 2.0.1 4.13.2 2.26.1 - 3.33.0 + 3.22.0 42.7.13 1.4.9 3.12.500 From faa6b2723e4c2a9f22723bb930b4ee6bf785e48b Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:30:57 +0300 Subject: [PATCH 12/29] up jface --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a58680b..e226a95 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 2.0.1 4.13.2 2.26.1 - 3.22.0 + 3.23.0 42.7.13 1.4.9 3.12.500 From e54f6f39cfea16121e751d6079af62970f911b7e Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:31:56 +0300 Subject: [PATCH 13/29] downgrade jface --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e226a95..c4f5130 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 2.0.1 4.13.2 2.26.1 - 3.23.0 + 3.22.200 42.7.13 1.4.9 3.12.500 From 7fd828a957bb5f148014fc32825784424a603069 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:34:00 +0300 Subject: [PATCH 14/29] downgrade commands --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4f5130..7bd1a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 3.22.200 42.7.13 1.4.9 - 3.12.500 + 3.10.0 3.20.400 1.21.4 From 149e15065ea7c5d12cfc3e1578898efe3ed2bc4d Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:35:21 +0300 Subject: [PATCH 15/29] downgrade commands --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7bd1a9c..30ec17f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 3.22.200 42.7.13 1.4.9 - 3.10.0 + 3.9.800 3.20.400 1.21.4 From 109c709b7de97c7cf4e15fcd465beeada14a07e0 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:43:27 +0300 Subject: [PATCH 16/29] downgrade equinox --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30ec17f..90833d1 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 42.7.13 1.4.9 3.9.800 - 3.20.400 + 3.15.0 1.21.4 From 7a942890be5f37fc454db803fa61e63027a6ac17 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:46:49 +0300 Subject: [PATCH 17/29] downgrade equinox --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90833d1..371c236 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 42.7.13 1.4.9 3.9.800 - 3.15.0 + 3.13.0 1.21.4 From 02f1357ee7baa3e60c84f199215839fa28cf4b67 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:48:21 +0300 Subject: [PATCH 18/29] up equinox --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 371c236..2d8a310 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 42.7.13 1.4.9 3.9.800 - 3.13.0 + 3.14.0 1.21.4 From 8af135e537110f7599dbebb1ec1b834955e2b7e2 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:50:29 +0300 Subject: [PATCH 19/29] up equinox --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d8a310..b9e9d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 42.7.13 1.4.9 3.9.800 - 3.14.0 + 3.14.100 1.21.4 From 47530ff2e9a723949b736f0857b29d33c07fc475 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 08:52:22 +0300 Subject: [PATCH 20/29] updated github actions --- .github/workflows/main.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1acf57c..4273166 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest name: Running Java 8 compile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 1.8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' @@ -23,9 +23,9 @@ jobs: name: Running tests needs: compile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 1.8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' @@ -37,9 +37,9 @@ jobs: name: mvn build needs: compile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 1.8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' From 29f8d8e7de98ed83423010a4d54a596e5663e58a Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 09:06:13 +0300 Subject: [PATCH 21/29] Removed query for PostgreSQL versions below 10 --- .../pgsqlblocks/common/DBQueries.java | 18 ------------------ .../pgsqlblocks/common/models/DBModel.java | 7 +++---- .../pgsqlblocks/dialogs/AddDatabaseDialog.java | 8 +------- .../dialogs/EditDatabaseDialog.java | 1 - .../modules/db/controller/DBController.java | 5 ++--- .../pgsqlblocks/xmlstore/DBModelsXmlStore.java | 3 +-- .../pgsqlblocks/common/models/DBModelTest.java | 2 +- .../db/controller/DBControllerTest.java | 2 +- 8 files changed, 9 insertions(+), 37 deletions(-) diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java index 07b3708..6b3e6fd 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java @@ -30,14 +30,10 @@ public final class DBQueries { public static final String PG_BACKEND_PID_QUERY = "select pg_backend_pid();"; private static String versionQuery; - private static String processesQuery; private static String processesQueryForTen; - private static String processesQueryWithIdle; private static String processesQueryWithIdleForTen; - private static final String PROCESSES_QUERY_FILE_NAME = "query.sql"; private static final String PROCESSES_QUERY_10_FILE_NAME = "query_10.sql"; - private static final String PROCESSES_QUERY_WITH_IDLE_FILE_NAME = "query_with_idle.sql"; private static final String PROCESSES_QUERY_WITH_IDLE_10_FILE_NAME = "query_with_idle_10.sql"; private static final String PG_SERVER_VERSION_QUERY_FILE_NAME = "version.sql"; @@ -45,13 +41,6 @@ public final class DBQueries { public static final String PG_CANCEL_BACKEND_QUERY = "select pg_cancel_backend(?);"; - public static synchronized String getProcessesQuery() { - if (processesQuery == null) { - processesQuery = loadQuery(PROCESSES_QUERY_FILE_NAME); - } - return processesQuery; - } - public static synchronized String getProcessesQueryForTen() { if (processesQueryForTen == null) { processesQueryForTen = loadQuery(PROCESSES_QUERY_10_FILE_NAME); @@ -59,13 +48,6 @@ public static synchronized String getProcessesQueryForTen() { return processesQueryForTen; } - public static synchronized String getProcessesQueryWithIdle() { - if (processesQueryWithIdle == null) { - processesQueryWithIdle = loadQuery(PROCESSES_QUERY_WITH_IDLE_FILE_NAME); - } - return processesQueryWithIdle; - } - public static synchronized String getProcessesQueryWithIdleForTen() { if (processesQueryWithIdleForTen == null) { processesQueryWithIdleForTen = loadQuery(PROCESSES_QUERY_WITH_IDLE_10_FILE_NAME); diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java index e147130..10a44fe 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java @@ -26,18 +26,17 @@ public class DBModel { private final String dbGroup; private final String user; private final String password; - private final boolean readBackendType; + private final boolean readBackendType = true; private final boolean enabled; public DBModel(String name, String host, String port, String databaseName, String dbGroup, - String user, String password, boolean readBackendType, boolean enabled) { + String user, String password, boolean enabled) { this.name = name; this.host = host; this.port = port; this.databaseName = databaseName; this.user = user; this.password = password; - this.readBackendType = readBackendType; this.enabled = enabled; this.dbGroup = dbGroup; } @@ -84,7 +83,7 @@ public boolean isEnabled() { public DBModel copy() { return new DBModel(this.name, this.host, this.port, this.databaseName, this.dbGroup, - this.user, this.password, this.readBackendType, this.enabled); + this.user, this.password, this.enabled); } @Override diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java index 6c5d212..024b7e4 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java @@ -49,7 +49,6 @@ public class AddDatabaseDialog extends Dialog { protected Text userText; protected Text passwordText; protected Text databaseNameText; - protected Button readBackendTypeButton; protected Button enabledButton; protected ComboViewer cmdDbGroup; private final Set dbGroup; @@ -138,10 +137,6 @@ protected Control createDialogArea(Composite parent) { GridData checkGd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1); - readBackendTypeButton = new Button(container, SWT.CHECK); - readBackendTypeButton.setText(resourceBundle.getString("read_backend_type")); - readBackendTypeButton.setLayoutData(checkGd); - enabledButton = new Button(container, SWT.CHECK); enabledButton.setText(resourceBundle.getString("connect_automatically")); enabledButton.setLayoutData(checkGd); @@ -158,7 +153,6 @@ protected void okPressed() { String dbGroup = cmdDbGroup.getCombo().getText(); String user = userText.getText(); String password = passwordText.getText(); - boolean readBackendType = readBackendTypeButton.getSelection(); boolean enabled = enabledButton.getSelection(); if (name.isEmpty()) { displayError("missing_connection_name"); @@ -175,7 +169,7 @@ protected void okPressed() { } createdModel = new DBModel(name, host, port, databaseName, dbGroup, user, - password, readBackendType, enabled); + password, enabled); super.okPressed(); } diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java index 678b7f4..1a7bfcf 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java @@ -56,7 +56,6 @@ protected Control createDialogArea(Composite parent) { cmdDbGroup.getCombo().setText(editedModel.getDbGroup()); userText.setText(editedModel.getUser()); passwordText.setText(editedModel.getPassword()); - readBackendTypeButton.setSelection(editedModel.isReadBackendType()); enabledButton.setSelection(editedModel.isEnabled()); return dialogArea; } diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java index 04f3a00..b8a029d 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java @@ -390,11 +390,10 @@ private void processesLoaded(List loadedProcesses) { } private String getProcessesQuery() { - boolean isTen = model.isReadBackendType(); if (settings.getShowIdle()) { - return isTen ? DBQueries.getProcessesQueryWithIdleForTen() : DBQueries.getProcessesQueryWithIdle(); + return DBQueries.getProcessesQueryWithIdleForTen(); } else { - return isTen ? DBQueries.getProcessesQueryForTen() : DBQueries.getProcessesQuery(); + return DBQueries.getProcessesQueryForTen(); } } diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java index f033616..5034a85 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java @@ -69,10 +69,9 @@ protected DBModel parseElement(Node node) { String dbGroup = getTextContentFromNode(dbGroupNode); String user = getTextContentFromNode(userNode); String password = getTextContentFromNode(passwordNode); - boolean readBackend = readBackendNode != null && Boolean.parseBoolean(getTextContentFromNode(readBackendNode)); boolean enabled = enabledNode != null && Boolean.parseBoolean(getTextContentFromNode(enabledNode)); - return new DBModel(name, host, port, databaseName, dbGroup, user, password, readBackend, enabled); + return new DBModel(name, host, port, databaseName, dbGroup, user, password, enabled); } @Override diff --git a/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java b/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java index f2b98cc..67a4be5 100644 --- a/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java +++ b/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java @@ -23,7 +23,7 @@ public class DBModelTest { @Test public void copyTest() { - DBModel model1 = new DBModel("test", "", "host", "port", "dbName", "user", "password", true, false); + DBModel model1 = new DBModel("test", "", "host", "port", "dbName", "user", "password", false); DBModel model2 = model1.copy(); assertEquals(model1, model2); diff --git a/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java b/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java index c389eb8..f81f04a 100644 --- a/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java +++ b/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java @@ -120,7 +120,7 @@ public static void initialize() { .withExposedPorts(5432); postgres.start(); DBModel model = new DBModel("TestDbc", REMOTE_HOST, postgres.getFirstMappedPort().toString(), - REMOTE_DB, "", REMOTE_USERNAME, REMOTE_PASSWORD, true, true); + REMOTE_DB, "", REMOTE_USERNAME, REMOTE_PASSWORD, true); testDbc = new DBController(Settings.getInstance(), model, null); testDbc.connectAsync(); testDbc.addListener(LISTENER); From e9bef0f56e3db583c9adcb7d940d9ce81ad6dd72 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 09:15:33 +0300 Subject: [PATCH 22/29] updated readme.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 3fd100b..30161fe 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,6 @@ pgSqlBlocks - это standalone приложение, написанное на ### Запросы -Для получения всех процессов сервера, включая или исключая idle(бездействующие), используется [скрипт](src/main/resources/query_with_idle.sql) или [скрипт](src/main/resources/query.sql) соответственно. - Для версии PostgreSQL 10 и выше, для получения всех процессов сервера, включая или исключая idle(бездействующие), используется [скрипт](src/main/resources/query_with_idle_10.sql) или [скрипт](src/main/resources/query_10.sql) соответственно. Уничтожается процесс командой: _select pg_terminate_backend(?);_ From 278edf43df710f84b08f6a8ba9350e3165bc6115 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 09:21:23 +0300 Subject: [PATCH 23/29] code clean up --- .../ru/taximaxim/pgsqlblocks/common/models/DBModel.java | 9 +-------- .../modules/blocksjournal/view/BlocksJournalView.java | 1 - .../taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java index 10a44fe..b3e177a 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java @@ -26,7 +26,6 @@ public class DBModel { private final String dbGroup; private final String user; private final String password; - private final boolean readBackendType = true; private final boolean enabled; public DBModel(String name, String host, String port, String databaseName, String dbGroup, @@ -53,10 +52,6 @@ public String getPort() { return port; } - public boolean isReadBackendType() { - return readBackendType; - } - public String getDatabaseName() { return databaseName; } @@ -96,7 +91,6 @@ public String toString() { ", dbGroup='" + dbGroup + '\'' + ", user='" + user + '\'' + ", password='" + password + '\'' + - ", readBackendType='" + readBackendType + '\'' + ", enabled=" + enabled + '}'; } @@ -120,12 +114,11 @@ public boolean equals(Object obj) { && Objects.equals(name, other.name) && Objects.equals(password, other.password) && Objects.equals(port, other.port) - && readBackendType == other.readBackendType && Objects.equals(user, other.user); } @Override public int hashCode() { - return Objects.hash(databaseName, dbGroup, enabled, host, name, password, port, readBackendType, user); + return Objects.hash(databaseName, dbGroup, enabled, host, name, password, port, user); } } diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java index f346623..cccac84 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.ResourceBundle; diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java index 5034a85..18b37bb 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java @@ -37,7 +37,6 @@ public class DBModelsXmlStore extends XmlStore { private static final String ELEMENT_DB_GROUP_NAME = "dbgroup"; private static final String ELEMENT_USER_TAG_NAME = "user"; private static final String ELEMENT_PASSWORD_TAG_NAME = "passwd"; - private static final String ELEMENT_READ_BACKEND_TAG_NAME = "readbt"; private static final String ELEMENT_ENABLED_TAG_NAME = "enabled"; public DBModelsXmlStore() { @@ -59,7 +58,6 @@ protected DBModel parseElement(Node node) { Node dbGroupNode = element.getElementsByTagName(ELEMENT_DB_GROUP_NAME).item(0); Node userNode = element.getElementsByTagName(ELEMENT_USER_TAG_NAME).item(0); Node passwordNode = element.getElementsByTagName(ELEMENT_PASSWORD_TAG_NAME).item(0); - Node readBackendNode = element.getElementsByTagName(ELEMENT_READ_BACKEND_TAG_NAME).item(0); Node enabledNode = element.getElementsByTagName(ELEMENT_ENABLED_TAG_NAME).item(0); String name = getTextContentFromNode(nameNode); @@ -87,7 +85,6 @@ protected void appendChildren(Document xml, Element root, List list) { createSubElement(xml, rootElement, ELEMENT_DB_GROUP_NAME, model.getDbGroup()); createSubElement(xml, rootElement, ELEMENT_USER_TAG_NAME, model.getUser()); createSubElement(xml, rootElement, ELEMENT_PASSWORD_TAG_NAME, model.getPassword()); - createSubElement(xml, rootElement, ELEMENT_READ_BACKEND_TAG_NAME, String.valueOf(model.isReadBackendType())); createSubElement(xml, rootElement, ELEMENT_ENABLED_TAG_NAME, String.valueOf(model.isEnabled())); } } From e18e63bd2d35f45d7cd016de43924d4df7f1d44c Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 09:25:43 +0300 Subject: [PATCH 24/29] updated license --- src/main/java/ru/taximaxim/pgsqlblocks/PgSqlBlocks.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/common/models/DBBlock.java | 2 +- .../pgsqlblocks/common/models/DBBlockDeserializer.java | 2 +- .../ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournal.java | 2 +- .../pgsqlblocks/common/models/DBBlocksJournalListener.java | 2 +- .../pgsqlblocks/common/models/DBBlocksJournalProcess.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/common/models/DBProcess.java | 2 +- .../ru/taximaxim/pgsqlblocks/common/models/DBProcessQuery.java | 2 +- .../pgsqlblocks/common/models/DBProcessQueryCaller.java | 2 +- .../ru/taximaxim/pgsqlblocks/common/models/DBProcessStatus.java | 2 +- .../pgsqlblocks/common/ui/DBBlocksJournalViewDataSource.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsView.java | 2 +- .../pgsqlblocks/common/ui/DBModelsViewContentProvider.java | 2 +- .../pgsqlblocks/common/ui/DBModelsViewLabelProvider.java | 2 +- .../taximaxim/pgsqlblocks/common/ui/DBModelsViewListener.java | 2 +- .../ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoView.java | 2 +- .../pgsqlblocks/common/ui/DBProcessInfoViewListener.java | 2 +- .../pgsqlblocks/common/ui/DBProcessesViewDataSource.java | 2 +- .../ru/taximaxim/pgsqlblocks/common/ui/TreeLabelProvider.java | 2 +- .../ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java | 2 +- .../ru/taximaxim/pgsqlblocks/dialogs/DBProcessInfoDialog.java | 2 +- .../ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/dialogs/PasswordDialog.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/dialogs/SettingsDialog.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_en.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_ru.java | 2 +- .../modules/application/controller/ApplicationController.java | 2 +- .../pgsqlblocks/modules/application/view/ApplicationView.java | 2 +- .../modules/application/view/ApplicationViewListener.java | 2 +- .../blocksjournal/view/BlocksJournalFilesContentProvider.java | 2 +- .../blocksjournal/view/BlocksJournalFilesLabelProvider.java | 2 +- .../modules/blocksjournal/view/BlocksJournalView.java | 2 +- .../pgsqlblocks/modules/db/controller/DBController.java | 2 +- .../pgsqlblocks/modules/db/controller/DBControllerListener.java | 2 +- .../modules/db/controller/UserInputPasswordProvider.java | 2 +- .../ru/taximaxim/pgsqlblocks/modules/db/model/DBStatus.java | 2 +- .../ru/taximaxim/pgsqlblocks/modules/logs/view/LogsView.java | 2 +- .../modules/processes/controller/ProcessesController.java | 2 +- .../pgsqlblocks/modules/processes/view/ProcessesView.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/ui/AboutDlg.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/ui/UIAppender.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/ColumnLayout.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/Columns.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/DateUtils.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/ImageUtils.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/Images.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/PathBuilder.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/utils/Settings.java | 2 +- .../java/ru/taximaxim/pgsqlblocks/utils/SettingsListener.java | 2 +- .../ru/taximaxim/pgsqlblocks/utils/UserCancelException.java | 2 +- .../taximaxim/pgsqlblocks/xmlstore/ColumnLayoutsXmlStore.java | 2 +- .../ru/taximaxim/pgsqlblocks/xmlstore/DBBlocksXmlStore.java | 2 +- .../ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java | 2 +- src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/XmlStore.java | 2 +- src/main/java/ru/taximaxim/treeviewer/ExtendedTreeViewer.java | 2 +- .../java/ru/taximaxim/treeviewer/dialog/ColumnConfigDialog.java | 2 +- src/main/java/ru/taximaxim/treeviewer/filter/ColumnType.java | 2 +- .../ru/taximaxim/treeviewer/filter/FilterChangeHandler.java | 2 +- .../java/ru/taximaxim/treeviewer/filter/FilterComposite.java | 2 +- .../java/ru/taximaxim/treeviewer/filter/FilterOperation.java | 2 +- src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer.java | 2 +- src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_en.java | 2 +- src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_ru.java | 2 +- src/main/java/ru/taximaxim/treeviewer/models/DataSource.java | 2 +- src/main/java/ru/taximaxim/treeviewer/models/IObject.java | 2 +- .../taximaxim/treeviewer/tree/ExtendedTreeViewerComponent.java | 2 +- .../java/ru/taximaxim/treeviewer/utils/AggregatingListener.java | 2 +- src/main/java/ru/taximaxim/treeviewer/utils/ImageUtils.java | 2 +- src/main/java/ru/taximaxim/treeviewer/utils/Images.java | 2 +- src/main/java/ru/taximaxim/treeviewer/utils/TriFunction.java | 2 +- .../pgsqlblocks/common/models/DBBlocksJournalTest.java | 2 +- .../ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java | 2 +- .../pgsqlblocks/modules/db/controller/DBControllerTest.java | 2 +- src/test/java/ru/taximaxim/pgsqlblocks/utils/DateUtilsTest.java | 2 +- 77 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/PgSqlBlocks.java b/src/main/java/ru/taximaxim/pgsqlblocks/PgSqlBlocks.java index 9db29ae..b31d0db 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/PgSqlBlocks.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/PgSqlBlocks.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java index 6b3e6fd..08bfd52 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlock.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlock.java index 7547037..26b7641 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlock.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlockDeserializer.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlockDeserializer.java index 7eed969..c7f2401 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlockDeserializer.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlockDeserializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournal.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournal.java index b04c945..84f33e8 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournal.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournal.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalListener.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalListener.java index e18357e..ee1e78d 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalListener.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalProcess.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalProcess.java index 99225af..cc9b795 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalProcess.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalProcess.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java index b3e177a..ee3dede 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcess.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcess.java index 32f91d3..002ed54 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcess.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcess.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQuery.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQuery.java index 0a99a43..ca2750f 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQuery.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQuery.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQueryCaller.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQueryCaller.java index 7ff6bab..1c1afbc 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQueryCaller.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessQueryCaller.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessStatus.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessStatus.java index b4c72ce..98b0ed5 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessStatus.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/models/DBProcessStatus.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBBlocksJournalViewDataSource.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBBlocksJournalViewDataSource.java index 92d7d4b..14f7af8 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBBlocksJournalViewDataSource.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBBlocksJournalViewDataSource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsView.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsView.java index 746301f..3eeaa48 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewContentProvider.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewContentProvider.java index b37d60f..e46a7fa 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewContentProvider.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewLabelProvider.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewLabelProvider.java index f8b4deb..53bb62e 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewLabelProvider.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewListener.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewListener.java index 82ff8bb..fcb078e 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewListener.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBModelsViewListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoView.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoView.java index 6d12bac..440e362 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoViewListener.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoViewListener.java index bd530f3..430ccea 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoViewListener.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessInfoViewListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessesViewDataSource.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessesViewDataSource.java index c19beb1..ae32f75 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessesViewDataSource.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/DBProcessesViewDataSource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/TreeLabelProvider.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/TreeLabelProvider.java index 42634c8..835f54a 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/TreeLabelProvider.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/ui/TreeLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java index 024b7e4..afadd1f 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/AddDatabaseDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/DBProcessInfoDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/DBProcessInfoDialog.java index 5895fde..ad7016d 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/DBProcessInfoDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/DBProcessInfoDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java index 1a7bfcf..cbce192 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/EditDatabaseDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/PasswordDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/PasswordDialog.java index 416bf3f..d7bef4f 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/PasswordDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/PasswordDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/SettingsDialog.java b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/SettingsDialog.java index f63c032..b41d12a 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/SettingsDialog.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/dialogs/SettingsDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks.java b/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks.java index aa2a74a..81752dd 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_en.java b/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_en.java index 64d2f22..369b137 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_en.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_en.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_ru.java b/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_ru.java index 90e056a..97a1e51 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_ru.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/l10n/PgSqlBlocks_ru.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/controller/ApplicationController.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/controller/ApplicationController.java index bfee07f..98d897f 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/controller/ApplicationController.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/controller/ApplicationController.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationView.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationView.java index 1e21361..f5bf62f 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationViewListener.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationViewListener.java index 848a7ee..26ae2de 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationViewListener.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/application/view/ApplicationViewListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesContentProvider.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesContentProvider.java index 3bde296..27326b6 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesContentProvider.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesLabelProvider.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesLabelProvider.java index 6ff0c47..29dd699 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesLabelProvider.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalFilesLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java index cccac84..958b9ee 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java index b8a029d..edbcb00 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerListener.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerListener.java index 4b12fbd..fa1d4a0 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerListener.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/UserInputPasswordProvider.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/UserInputPasswordProvider.java index 28de16d..8a35f66 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/UserInputPasswordProvider.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/UserInputPasswordProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/model/DBStatus.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/model/DBStatus.java index 7637a71..f34b10a 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/model/DBStatus.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/model/DBStatus.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/logs/view/LogsView.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/logs/view/LogsView.java index 9ec7db2..df778a4 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/logs/view/LogsView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/logs/view/LogsView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/controller/ProcessesController.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/controller/ProcessesController.java index 426ee9d..f6771e7 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/controller/ProcessesController.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/controller/ProcessesController.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/view/ProcessesView.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/view/ProcessesView.java index 5471db8..3d25915 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/view/ProcessesView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/processes/view/ProcessesView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/ui/AboutDlg.java b/src/main/java/ru/taximaxim/pgsqlblocks/ui/AboutDlg.java index c3df8ef..a504df6 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/ui/AboutDlg.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/ui/AboutDlg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/ui/UIAppender.java b/src/main/java/ru/taximaxim/pgsqlblocks/ui/UIAppender.java index 586acda..4bb5819 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/ui/UIAppender.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/ui/UIAppender.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/ColumnLayout.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/ColumnLayout.java index 8c3fe1c..af06297 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/ColumnLayout.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/ColumnLayout.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/Columns.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/Columns.java index c7fcacd..1f7aabb 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/Columns.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/Columns.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/DateUtils.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/DateUtils.java index f7cf8ce..e666f52 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/DateUtils.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/DateUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/ImageUtils.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/ImageUtils.java index d84c5b9..afc6e1d 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/ImageUtils.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/ImageUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/Images.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/Images.java index 8e5ea2c..c441a5e 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/Images.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/Images.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/PathBuilder.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/PathBuilder.java index edfa621..a069e2f 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/PathBuilder.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/PathBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/Settings.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/Settings.java index 47a27eb..837a2e0 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/Settings.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/Settings.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/SettingsListener.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/SettingsListener.java index c7f078c..b573456 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/SettingsListener.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/SettingsListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/utils/UserCancelException.java b/src/main/java/ru/taximaxim/pgsqlblocks/utils/UserCancelException.java index b6cd622..81cf930 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/utils/UserCancelException.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/utils/UserCancelException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/ColumnLayoutsXmlStore.java b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/ColumnLayoutsXmlStore.java index 3dd602a..4aa7d2d 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/ColumnLayoutsXmlStore.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/ColumnLayoutsXmlStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBBlocksXmlStore.java b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBBlocksXmlStore.java index c6fddbb..4bc1306 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBBlocksXmlStore.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBBlocksXmlStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java index 18b37bb..c10bf5a 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/DBModelsXmlStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/XmlStore.java b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/XmlStore.java index 73a259d..5a24cf6 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/XmlStore.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/xmlstore/XmlStore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/ExtendedTreeViewer.java b/src/main/java/ru/taximaxim/treeviewer/ExtendedTreeViewer.java index 520406a..ef28de7 100644 --- a/src/main/java/ru/taximaxim/treeviewer/ExtendedTreeViewer.java +++ b/src/main/java/ru/taximaxim/treeviewer/ExtendedTreeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/dialog/ColumnConfigDialog.java b/src/main/java/ru/taximaxim/treeviewer/dialog/ColumnConfigDialog.java index eb5b13a..4c028ad 100644 --- a/src/main/java/ru/taximaxim/treeviewer/dialog/ColumnConfigDialog.java +++ b/src/main/java/ru/taximaxim/treeviewer/dialog/ColumnConfigDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/filter/ColumnType.java b/src/main/java/ru/taximaxim/treeviewer/filter/ColumnType.java index 6d7963c..b4e914e 100644 --- a/src/main/java/ru/taximaxim/treeviewer/filter/ColumnType.java +++ b/src/main/java/ru/taximaxim/treeviewer/filter/ColumnType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/filter/FilterChangeHandler.java b/src/main/java/ru/taximaxim/treeviewer/filter/FilterChangeHandler.java index e071a1d..bbbe46a 100644 --- a/src/main/java/ru/taximaxim/treeviewer/filter/FilterChangeHandler.java +++ b/src/main/java/ru/taximaxim/treeviewer/filter/FilterChangeHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/filter/FilterComposite.java b/src/main/java/ru/taximaxim/treeviewer/filter/FilterComposite.java index ba5137d..a97e373 100644 --- a/src/main/java/ru/taximaxim/treeviewer/filter/FilterComposite.java +++ b/src/main/java/ru/taximaxim/treeviewer/filter/FilterComposite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/filter/FilterOperation.java b/src/main/java/ru/taximaxim/treeviewer/filter/FilterOperation.java index 38ad3d7..07eb43f 100644 --- a/src/main/java/ru/taximaxim/treeviewer/filter/FilterOperation.java +++ b/src/main/java/ru/taximaxim/treeviewer/filter/FilterOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer.java b/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer.java index c42efcb..8b43e5e 100644 --- a/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer.java +++ b/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_en.java b/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_en.java index 4cf8aa5..74ae633 100644 --- a/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_en.java +++ b/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_en.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_ru.java b/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_ru.java index 9f42f19..1b8e522 100644 --- a/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_ru.java +++ b/src/main/java/ru/taximaxim/treeviewer/l10n/TreeViewer_ru.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/models/DataSource.java b/src/main/java/ru/taximaxim/treeviewer/models/DataSource.java index c0ead71..2e4e403 100644 --- a/src/main/java/ru/taximaxim/treeviewer/models/DataSource.java +++ b/src/main/java/ru/taximaxim/treeviewer/models/DataSource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/models/IObject.java b/src/main/java/ru/taximaxim/treeviewer/models/IObject.java index 3a29e7c..c4e2e71 100644 --- a/src/main/java/ru/taximaxim/treeviewer/models/IObject.java +++ b/src/main/java/ru/taximaxim/treeviewer/models/IObject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/tree/ExtendedTreeViewerComponent.java b/src/main/java/ru/taximaxim/treeviewer/tree/ExtendedTreeViewerComponent.java index 24bfa69..57a692e 100644 --- a/src/main/java/ru/taximaxim/treeviewer/tree/ExtendedTreeViewerComponent.java +++ b/src/main/java/ru/taximaxim/treeviewer/tree/ExtendedTreeViewerComponent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/utils/AggregatingListener.java b/src/main/java/ru/taximaxim/treeviewer/utils/AggregatingListener.java index 024807c..e142427 100644 --- a/src/main/java/ru/taximaxim/treeviewer/utils/AggregatingListener.java +++ b/src/main/java/ru/taximaxim/treeviewer/utils/AggregatingListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/utils/ImageUtils.java b/src/main/java/ru/taximaxim/treeviewer/utils/ImageUtils.java index 4c8d78c..f2c7254 100644 --- a/src/main/java/ru/taximaxim/treeviewer/utils/ImageUtils.java +++ b/src/main/java/ru/taximaxim/treeviewer/utils/ImageUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/utils/Images.java b/src/main/java/ru/taximaxim/treeviewer/utils/Images.java index a2d0f41..09d1bb1 100644 --- a/src/main/java/ru/taximaxim/treeviewer/utils/Images.java +++ b/src/main/java/ru/taximaxim/treeviewer/utils/Images.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/ru/taximaxim/treeviewer/utils/TriFunction.java b/src/main/java/ru/taximaxim/treeviewer/utils/TriFunction.java index c3e1061..8f23045 100644 --- a/src/main/java/ru/taximaxim/treeviewer/utils/TriFunction.java +++ b/src/main/java/ru/taximaxim/treeviewer/utils/TriFunction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalTest.java b/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalTest.java index 17055af..dc9322f 100644 --- a/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalTest.java +++ b/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBBlocksJournalTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java b/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java index 67a4be5..afa7850 100644 --- a/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java +++ b/src/test/java/ru/taximaxim/pgsqlblocks/common/models/DBModelTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java b/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java index f81f04a..fbc8158 100644 --- a/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java +++ b/src/test/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBControllerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/ru/taximaxim/pgsqlblocks/utils/DateUtilsTest.java b/src/test/java/ru/taximaxim/pgsqlblocks/utils/DateUtilsTest.java index 159b34a..a372452 100644 --- a/src/test/java/ru/taximaxim/pgsqlblocks/utils/DateUtilsTest.java +++ b/src/test/java/ru/taximaxim/pgsqlblocks/utils/DateUtilsTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2017-2024 TAXTELECOM, LLC + * Copyright 2017-2026 TAXTELECOM, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 8480fce9efa8db13a87848ed5c5c731e1f1b4d31 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 09:30:36 +0300 Subject: [PATCH 25/29] updated pom and changelog --- CHANGELOG.md | 7 +++++++ pom.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f13042..e44847b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ java-приложение для работы с блокировками в С ### Версии +2.0.0 + +* Обновлены библиотеки +* Обновлены action-ы в gitHub Actions +* Обновлена лицензия +* Убран спецальный параметр `Читать тип процесса` для 10 версии Postresql в настройках соединения. Теперь он по умолчанию включен. + 1.9.0 * Добавлен gitHub Actions diff --git a/pom.xml b/pom.xml index b9e9d3e..aad71d4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ru.taximaxim pgsqlblocks - 1.9.0 + 2.0.0 jar pgSqlBlocks From be8e4daa44efc164dcf9dd9fadba46cd0c5949f2 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 09:38:19 +0300 Subject: [PATCH 26/29] code clean up --- .../pgsqlblocks/common/DBQueries.java | 24 ++++---- .../modules/db/controller/DBController.java | 6 +- src/main/resources/query.sql | 3 +- src/main/resources/query_10.sql | 60 ------------------- src/main/resources/query_with_idle.sql | 1 + src/main/resources/query_with_idle_10.sql | 57 ------------------ 6 files changed, 16 insertions(+), 135 deletions(-) delete mode 100644 src/main/resources/query_10.sql delete mode 100644 src/main/resources/query_with_idle_10.sql diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java b/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java index 08bfd52..3748a17 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/common/DBQueries.java @@ -30,29 +30,29 @@ public final class DBQueries { public static final String PG_BACKEND_PID_QUERY = "select pg_backend_pid();"; private static String versionQuery; - private static String processesQueryForTen; - private static String processesQueryWithIdleForTen; + private static String processesQuery; + private static String processesQueryWithIdle; - private static final String PROCESSES_QUERY_10_FILE_NAME = "query_10.sql"; - private static final String PROCESSES_QUERY_WITH_IDLE_10_FILE_NAME = "query_with_idle_10.sql"; + private static final String PROCESSES_QUERY_FILE_NAME = "query.sql"; + private static final String PROCESSES_QUERY_WITH_IDLE_FILE_NAME = "query_with_idle.sql"; private static final String PG_SERVER_VERSION_QUERY_FILE_NAME = "version.sql"; public static final String PG_TERMINATE_BACKEND_QUERY = "select pg_terminate_backend(?);"; public static final String PG_CANCEL_BACKEND_QUERY = "select pg_cancel_backend(?);"; - public static synchronized String getProcessesQueryForTen() { - if (processesQueryForTen == null) { - processesQueryForTen = loadQuery(PROCESSES_QUERY_10_FILE_NAME); + public static synchronized String getProcessesQuery() { + if (processesQuery == null) { + processesQuery = loadQuery(PROCESSES_QUERY_FILE_NAME); } - return processesQueryForTen; + return processesQuery; } - public static synchronized String getProcessesQueryWithIdleForTen() { - if (processesQueryWithIdleForTen == null) { - processesQueryWithIdleForTen = loadQuery(PROCESSES_QUERY_WITH_IDLE_10_FILE_NAME); + public static synchronized String getProcessesQueryWithIdle() { + if (processesQueryWithIdle == null) { + processesQueryWithIdle = loadQuery(PROCESSES_QUERY_WITH_IDLE_FILE_NAME); } - return processesQueryWithIdleForTen; + return processesQueryWithIdle; } public static synchronized String getVersionQuery(){ diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java index edbcb00..a69e627 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/db/controller/DBController.java @@ -390,11 +390,7 @@ private void processesLoaded(List loadedProcesses) { } private String getProcessesQuery() { - if (settings.getShowIdle()) { - return DBQueries.getProcessesQueryWithIdleForTen(); - } else { - return DBQueries.getProcessesQueryForTen(); - } + return settings.getShowIdle() ? DBQueries.getProcessesQueryWithIdle() : DBQueries.getProcessesQuery(); } public void addListener(DBControllerListener listener) { diff --git a/src/main/resources/query.sql b/src/main/resources/query.sql index 73e9dfb..5dc0697 100644 --- a/src/main/resources/query.sql +++ b/src/main/resources/query.sql @@ -27,7 +27,8 @@ SELECT application_name, datname, usename, - CASE WHEN client_port=-1 THEN 'local pipe' + backend_type, + CASE WHEN client_port=-1 THEN 'local pipe' WHEN length(client_hostname)>0 THEN client_hostname||':'||client_port ELSE textin(inet_out(client_addr))||':'||client_port END AS client, diff --git a/src/main/resources/query_10.sql b/src/main/resources/query_10.sql deleted file mode 100644 index 5dc0697..0000000 --- a/src/main/resources/query_10.sql +++ /dev/null @@ -1,60 +0,0 @@ -WITH blocks AS ( - SELECT - blocking_locks.pid as pid, - blocked_locks.pid as blocked_pid, - blocking_locks.locktype as locktype, - blocking_locks.relation::regclass as relation, - blocking_locks.granted as granted - FROM - pg_catalog.pg_locks blocked_locks - JOIN - pg_catalog.pg_locks blocking_locks - ON blocking_locks.locktype = blocked_locks.locktype - AND blocking_locks.DATABASE IS NOT DISTINCT FROM blocked_locks.DATABASE - AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation - AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page - AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple - AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid - AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid - AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid - AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid - AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid - AND blocking_locks.pid != blocked_locks.pid - WHERE NOT blocked_locks.granted -) -SELECT - procs.pid AS pid, - application_name, - datname, - usename, - backend_type, - CASE WHEN client_port=-1 THEN 'local pipe' - WHEN length(client_hostname)>0 THEN client_hostname||':'||client_port - ELSE textin(inet_out(client_addr))||':'||client_port - END AS client, - date_trunc('second', backend_start) AS backend_start, - CASE WHEN state='active' THEN date_trunc('second', query_start)::text - ELSE '' - END AS query_start, - date_trunc('second', xact_start) AS xact_start, - state, - date_trunc('second', state_change) AS state_change, - blocks.pid AS blockedby, - /* deprecated - null::text AS blocking_locks,*/ - blocks.locktype AS locktype, - blocks.relation AS relation, - blocks.granted AS granted, - query AS query, - CASE WHEN query_start IS NULL OR state<>'active' THEN false - ELSE query_start < now() - '10 seconds'::interval - END AS slowquery -FROM - pg_stat_activity procs - LEFT JOIN blocks - ON blocks.blocked_pid = procs.pid -WHERE - procs.state != 'idle' - OR procs.state IS NULL -ORDER BY - pid diff --git a/src/main/resources/query_with_idle.sql b/src/main/resources/query_with_idle.sql index af7e984..7e91301 100644 --- a/src/main/resources/query_with_idle.sql +++ b/src/main/resources/query_with_idle.sql @@ -27,6 +27,7 @@ SELECT application_name, datname, usename, + backend_type, CASE WHEN client_port=-1 THEN 'local pipe' WHEN length(client_hostname)>0 THEN client_hostname||':'||client_port ELSE textin(inet_out(client_addr))||':'||client_port diff --git a/src/main/resources/query_with_idle_10.sql b/src/main/resources/query_with_idle_10.sql deleted file mode 100644 index 7e91301..0000000 --- a/src/main/resources/query_with_idle_10.sql +++ /dev/null @@ -1,57 +0,0 @@ -WITH blocks AS ( - SELECT - blocking_locks.pid as pid, - blocked_locks.pid as blocked_pid, - blocking_locks.locktype as locktype, - blocking_locks.relation::regclass as relation, - blocking_locks.granted as granted - FROM - pg_catalog.pg_locks blocked_locks - JOIN - pg_catalog.pg_locks blocking_locks - ON blocking_locks.locktype = blocked_locks.locktype - AND blocking_locks.DATABASE IS NOT DISTINCT FROM blocked_locks.DATABASE - AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation - AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page - AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple - AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid - AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid - AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid - AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid - AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid - AND blocking_locks.pid != blocked_locks.pid - WHERE NOT blocked_locks.granted -) -SELECT - procs.pid AS pid, - application_name, - datname, - usename, - backend_type, - CASE WHEN client_port=-1 THEN 'local pipe' - WHEN length(client_hostname)>0 THEN client_hostname||':'||client_port - ELSE textin(inet_out(client_addr))||':'||client_port - END AS client, - date_trunc('second', backend_start) AS backend_start, - CASE WHEN state='active' THEN date_trunc('second', query_start)::text - ELSE '' - END AS query_start, - date_trunc('second', xact_start) AS xact_start, - state, - date_trunc('second', state_change) AS state_change, - blocks.pid AS blockedby, - /* deprecated - null::text AS blocking_locks,*/ - blocks.locktype AS locktype, - blocks.relation AS relation, - blocks.granted AS granted, - query AS query, - CASE WHEN query_start IS NULL OR state<>'active' THEN false - ELSE query_start < now() - '10 seconds'::interval - END AS slowquery -FROM - pg_stat_activity procs - LEFT JOIN blocks - ON blocks.blocked_pid = procs.pid -ORDER BY - pid From 8001cd7f18752c66fa383182cc699080d319e893 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 10:20:03 +0300 Subject: [PATCH 27/29] updated by feedback --- CHANGELOG.md | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e44847b..175abdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ java-приложение для работы с блокировками в С * Обновлены библиотеки * Обновлены action-ы в gitHub Actions * Обновлена лицензия -* Убран спецальный параметр `Читать тип процесса` для 10 версии Postresql в настройках соединения. Теперь он по умолчанию включен. +* Прекращена поддержка PostgreSQL версий ниже 10, удалена настройка для отображения типа процесса 1.9.0 diff --git a/README.md b/README.md index 30161fe..5a30608 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ pgSqlBlocks - это standalone приложение, написанное на языке программирования Java, которое позволяет легко ориентироваться среди процессов и получать информацию о блокировках и ожидающих запросов в СУБД PostgreSQL. Отображается информация о состоянии подключения к БД, а также информация о процессах в БД. +Поддерживается работа с PostgreSQL 10+. + Требуется Java JRE версии 1.8 и выше для вашей платформы. ### Сборка, запуск тестов, запуск приложения From 86855b756c08bf94823c7c2b2daab97372cbcbe9 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 10:26:43 +0300 Subject: [PATCH 28/29] updated by feedback --- src/main/resources/query.sql | 2 -- src/main/resources/query_with_idle.sql | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/main/resources/query.sql b/src/main/resources/query.sql index 5dc0697..4c3cf84 100644 --- a/src/main/resources/query.sql +++ b/src/main/resources/query.sql @@ -40,8 +40,6 @@ SELECT state, date_trunc('second', state_change) AS state_change, blocks.pid AS blockedby, - /* deprecated - null::text AS blocking_locks,*/ blocks.locktype AS locktype, blocks.relation AS relation, blocks.granted AS granted, diff --git a/src/main/resources/query_with_idle.sql b/src/main/resources/query_with_idle.sql index 7e91301..3b97ba2 100644 --- a/src/main/resources/query_with_idle.sql +++ b/src/main/resources/query_with_idle.sql @@ -40,8 +40,6 @@ SELECT state, date_trunc('second', state_change) AS state_change, blocks.pid AS blockedby, - /* deprecated - null::text AS blocking_locks,*/ blocks.locktype AS locktype, blocks.relation AS relation, blocks.granted AS granted, From 5044e851db3429349c67e4ca519a3358e1459515 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 15:34:08 +0300 Subject: [PATCH 29/29] revert version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aad71d4..b9e9d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ru.taximaxim pgsqlblocks - 2.0.0 + 1.9.0 jar pgSqlBlocks