https://git.useribm.hu / mediacube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 942a3f7)
Elgépelés javítása
authorOmar Sweidan <omar.sweidan@userrendszerhaz.hu>
Tue, 21 Jun 2022 10:55:26 +0000 (12:55 +0200)
committerOmar Sweidan <omar.sweidan@userrendszerhaz.hu>
Wed, 22 Jun 2022 11:57:09 +0000 (13:57 +0200)
server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java patch | blob | history
server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java patch | blob | history
server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java patch | blob | history
server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java patch | blob | history
server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java patch | blob | history
server/user.jobengine.osgi.commons/src/user/commons/RemoteFile.java patch | blob | history
server/user.jobengine.osgi.db/src/user/jobengine/db/Item.java patch | blob | history
server/user.mediacube.gui/pages/menu.zul patch | blob | history

diff --git a/server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java b/server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java
index c7bfb3caccf7b7922b56ac83b6ef06dab4f7a17b..9bf16e965fc1b5b88e56045efec88f97427bef0b 100644 (file)
--- a/server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java
+++ b/server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java
@@ -35,7 +35,7 @@ public class MetadataTransformStep extends JobStep {
        public static final String DEFAULT_MEDIATYPE = "Generic";\r
        private ItemManager itemManager;\r
 \r
-       private Marker marker;;\r
+       private Marker marker;\r
 \r
        private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) {\r
                BasicDBList tags = archiveItem.getTags();\r
diff --git a/server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java b/server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java
index d19382037bfb7a731bae89825c2dc055aac67953..a1b0bc416aa52eb34427aa17e14f82728b928946 100644 (file)
--- a/server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java
+++ b/server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java
@@ -35,7 +35,7 @@ public class MetadataTransformStep extends JobStep {
        public static final String DEFAULT_MEDIATYPE = "Generic";\r
        private ItemManager itemManager;\r
 \r
-       private Marker marker;;\r
+       private Marker marker;\r
 \r
        private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) {\r
                BasicDBList tags = archiveItem.getTags();\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java
index d19382037bfb7a731bae89825c2dc055aac67953..a1b0bc416aa52eb34427aa17e14f82728b928946 100644 (file)
--- a/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java
+++ b/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java
@@ -35,7 +35,7 @@ public class MetadataTransformStep extends JobStep {
        public static final String DEFAULT_MEDIATYPE = "Generic";\r
        private ItemManager itemManager;\r
 \r
-       private Marker marker;;\r
+       private Marker marker;\r
 \r
        private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) {\r
                BasicDBList tags = archiveItem.getTags();\r
diff --git a/server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java b/server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java
index c7bfb3caccf7b7922b56ac83b6ef06dab4f7a17b..9bf16e965fc1b5b88e56045efec88f97427bef0b 100644 (file)
--- a/server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java
+++ b/server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java
@@ -35,7 +35,7 @@ public class MetadataTransformStep extends JobStep {
        public static final String DEFAULT_MEDIATYPE = "Generic";\r
        private ItemManager itemManager;\r
 \r
-       private Marker marker;;\r
+       private Marker marker;\r
 \r
        private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) {\r
                BasicDBList tags = archiveItem.getTags();\r
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java
index 4bd544153fde38aa394218872554a764d10b7560..72a5e5f5d96c6b422a89fafa3ccc3fa31d193781 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java
@@ -27,7 +27,7 @@ public class MetadataTransformStep extends JobStep {
        private static final String CONFLICT = ".CONFLICT";\r
        private static final Logger logger = LogManager.getLogger();\r
        public static final String DEFAULT_MEDIATYPE = "Generic";\r
-       private Marker marker;;\r
+       private Marker marker;\r
 \r
        private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) {\r
                BasicDBList tags = archiveItem.getTags();\r
@@ -57,21 +57,23 @@ public class MetadataTransformStep extends JobStep {
                                Files.move(metadataPath, Paths.get(conflictPath.toString(), metadataPath.getFileName().toString()));\r
                } catch (Exception e1) {\r
                        logger.catching(e1);\r
-                       logger.error(marker, "Hiba az '{}' állomány mappába mozgatásakor. A rendszer üzenete: {}", CONFLICT, e1.getMessage());\r
+                       logger.error(marker, "Hiba az '{}' állomány mappába mozgatásakor. A rendszer üzenete: {}", CONFLICT,\r
+                                       e1.getMessage());\r
                }\r
        }\r
 \r
        private Item createItem(ArchiveItem archiveItem) {\r
                Item mediaCubeItem = getExistingItem(archiveItem.getItemHouseId(), archiveItem.getItemTitle());\r
                if (mediaCubeItem == null)\r
-                       mediaCubeItem = getManager().createItem(DEFAULT_MEDIATYPE, archiveItem.getItemTitle(), archiveItem.getItemDescription(),\r
-                                       archiveItem.getItemHouseId());\r
+                       mediaCubeItem = getManager().createItem(DEFAULT_MEDIATYPE, archiveItem.getItemTitle(),\r
+                                       archiveItem.getItemDescription(), archiveItem.getItemHouseId());\r
                return mediaCubeItem;\r
        }\r
 \r
        private Media createMedia(ArchiveItem archiveItem, Item mediaCubeItem, String mediaType) {\r
                Media mediaCubeMedia;\r
-               mediaCubeMedia = getManager().createMedia(mediaType, archiveItem.getMediaTitle(), archiveItem.getMediaDescription(), archiveItem.getMediaHouseId());\r
+               mediaCubeMedia = getManager().createMedia(mediaType, archiveItem.getMediaTitle(),\r
+                               archiveItem.getMediaDescription(), archiveItem.getMediaHouseId());\r
                mediaCubeMedia.setLength(archiveItem.getDuration());\r
                mediaCubeItem.appendMedia(mediaCubeMedia);\r
 \r
@@ -90,7 +92,8 @@ public class MetadataTransformStep extends JobStep {
 \r
                        if (getManager().isMediaFileExists(sourceFileName)) {\r
                                cleanUpOnDuplicate(archiveItem, sourceFileName);\r
-                               logger.warn(marker, "Az '" + sourceFileName + "' állomány már megtalálható az archívumban, archiválása nem lehetséges.");\r
+                               logger.warn(marker, "Az '" + sourceFileName\r
+                                               + "' állomány már megtalálható az archívumban, archiválása nem lehetséges.");\r
                                cancel();\r
                                return null;\r
                        }\r
@@ -113,8 +116,9 @@ public class MetadataTransformStep extends JobStep {
                } catch (Exception e) {\r
                        logger.catching(e);\r
                        String fileName = new File(archiveItem.getMediaFile()).getName();\r
-                       logger.error(marker, "Az '{}' állomány nem archiválható, mert a metaadat transzformáció sikertelen. A rendszer üzenete: {}", fileName,\r
-                                       e.getMessage());\r
+                       logger.error(marker,\r
+                                       "Az '{}' állomány nem archiválható, mert a metaadat transzformáció sikertelen. A rendszer üzenete: {}",\r
+                                       fileName, e.getMessage());\r
                        if (!archiveItem.removeCatchedFile())\r
                                logger.error(marker, "Az '{}' állomány .catched jelző állománya nem törölhető.", fileName);\r
                        throw e;\r
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/RemoteFile.java b/server/user.jobengine.osgi.commons/src/user/commons/RemoteFile.java
index 59402be780cb90e35837c86832d6ba90815b31d5..e78e09d337982aad28bc10338f6dd714895d6a09 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/RemoteFile.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/RemoteFile.java
@@ -11,7 +11,7 @@ public class RemoteFile extends EntityBase implements Serializable {
        private Timestamp created;\r
        private Timestamp modify;\r
        private long size;\r
-       private boolean isFolder = false;;\r
+       private boolean isFolder = false;\r
        private Object sourceObject = null;\r
        private byte[] content;\r
 \r
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/Item.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/Item.java
index 977ab046328be61c4672c1e7ab42b28cfea593eb..a4a24c7f94ad44b9ea4335e7a1bdf115f5d494f2 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/Item.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/Item.java
@@ -22,7 +22,7 @@ public class Item extends DynamicAttributes {
        private String houseId = null;
        private List<Media> medias = null;
        private String title = null;
-       private boolean isFolder = false;;
+       private boolean isFolder = false;
        private Long folderId = null;
 
        public void appendMedia(Media media) {
diff --git a/server/user.mediacube.gui/pages/menu.zul b/server/user.mediacube.gui/pages/menu.zul
index 6da8d90add91ebd72f90b9778a32c04104410b34..0b955abfa5c39b53592829109f02bae3d8baebb0 100644 (file)
--- a/server/user.mediacube.gui/pages/menu.zul
+++ b/server/user.mediacube.gui/pages/menu.zul
@@ -22,7 +22,7 @@
                        </menu>\r
                        <menu sclass="whitemenu" label="Továbbiak" visible="${sessionScope.userPrincipal.submitter}">\r
                                <menupopup>\r
-                                       <menuitem sclass="rozsda" label="Jelszógeneátor" onClick="@command('navigate', action='pwdgen')" \r
+                                       <menuitem sclass="rozsda" label="Jelszógenerátor" onClick="@command('navigate', action='pwdgen')" \r
                                                disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
                                        <menuitem sclass="rozsda" label="Hiányzó anyagok" onClick="@command('navigate', action='missingmaterials')" \r
                                                disabled="${not sessionScope.userPrincipal.submitter or sessionScope.userPrincipal.anonymous}" />\r
mediacube repository