From: Omar Sweidan Date: Tue, 21 Jun 2022 10:55:26 +0000 (+0200) Subject: Elgépelés javítása X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=79974db0cf395751aef96ae357b956adb29bd784;p=mediacube.git Elgépelés javítása --- diff --git a/server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java b/server/-product/production/LOCAL/jobs/steps/MetadataTransformStep.java index c7bfb3ca..9bf16e96 100644 --- 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"; private ItemManager itemManager; - private Marker marker;; + private Marker marker; private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) { BasicDBList tags = archiveItem.getTags(); diff --git a/server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java b/server/-product/production/MEDIAVIVANTIS-TEST/jobs/steps/MetadataTransformStep.java index d1938203..a1b0bc41 100644 --- 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"; private ItemManager itemManager; - private Marker marker;; + private Marker marker; private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) { BasicDBList tags = archiveItem.getTags(); diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/MetadataTransformStep.java index d1938203..a1b0bc41 100644 --- 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"; private ItemManager itemManager; - private Marker marker;; + private Marker marker; private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) { BasicDBList tags = archiveItem.getTags(); diff --git a/server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java b/server/-product/production/OMAR/jobs/steps/MetadataTransformStep.java index c7bfb3ca..9bf16e96 100644 --- 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"; private ItemManager itemManager; - private Marker marker;; + private Marker marker; private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) { BasicDBList tags = archiveItem.getTags(); 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 4bd54415..72a5e5f5 100644 --- 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"; private static final Logger logger = LogManager.getLogger(); public static final String DEFAULT_MEDIATYPE = "Generic"; - private Marker marker;; + private Marker marker; private void addTags(ArchiveItem archiveItem, Media mediaCubeMedia) { BasicDBList tags = archiveItem.getTags(); @@ -57,21 +57,23 @@ public class MetadataTransformStep extends JobStep { Files.move(metadataPath, Paths.get(conflictPath.toString(), metadataPath.getFileName().toString())); } catch (Exception e1) { logger.catching(e1); - logger.error(marker, "Hiba az '{}' állomány mappába mozgatásakor. A rendszer üzenete: {}", CONFLICT, e1.getMessage()); + logger.error(marker, "Hiba az '{}' állomány mappába mozgatásakor. A rendszer üzenete: {}", CONFLICT, + e1.getMessage()); } } private Item createItem(ArchiveItem archiveItem) { Item mediaCubeItem = getExistingItem(archiveItem.getItemHouseId(), archiveItem.getItemTitle()); if (mediaCubeItem == null) - mediaCubeItem = getManager().createItem(DEFAULT_MEDIATYPE, archiveItem.getItemTitle(), archiveItem.getItemDescription(), - archiveItem.getItemHouseId()); + mediaCubeItem = getManager().createItem(DEFAULT_MEDIATYPE, archiveItem.getItemTitle(), + archiveItem.getItemDescription(), archiveItem.getItemHouseId()); return mediaCubeItem; } private Media createMedia(ArchiveItem archiveItem, Item mediaCubeItem, String mediaType) { Media mediaCubeMedia; - mediaCubeMedia = getManager().createMedia(mediaType, archiveItem.getMediaTitle(), archiveItem.getMediaDescription(), archiveItem.getMediaHouseId()); + mediaCubeMedia = getManager().createMedia(mediaType, archiveItem.getMediaTitle(), + archiveItem.getMediaDescription(), archiveItem.getMediaHouseId()); mediaCubeMedia.setLength(archiveItem.getDuration()); mediaCubeItem.appendMedia(mediaCubeMedia); @@ -90,7 +92,8 @@ public class MetadataTransformStep extends JobStep { if (getManager().isMediaFileExists(sourceFileName)) { cleanUpOnDuplicate(archiveItem, sourceFileName); - logger.warn(marker, "Az '" + sourceFileName + "' állomány már megtalálható az archívumban, archiválása nem lehetséges."); + logger.warn(marker, "Az '" + sourceFileName + + "' állomány már megtalálható az archívumban, archiválása nem lehetséges."); cancel(); return null; } @@ -113,8 +116,9 @@ public class MetadataTransformStep extends JobStep { } catch (Exception e) { logger.catching(e); String fileName = new File(archiveItem.getMediaFile()).getName(); - logger.error(marker, "Az '{}' állomány nem archiválható, mert a metaadat transzformáció sikertelen. A rendszer üzenete: {}", fileName, - e.getMessage()); + logger.error(marker, + "Az '{}' állomány nem archiválható, mert a metaadat transzformáció sikertelen. A rendszer üzenete: {}", + fileName, e.getMessage()); if (!archiveItem.removeCatchedFile()) logger.error(marker, "Az '{}' állomány .catched jelző állománya nem törölhető.", fileName); throw e; 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 59402be7..e78e09d3 100644 --- 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; private Timestamp modify; private long size; - private boolean isFolder = false;; + private boolean isFolder = false; private Object sourceObject = null; private byte[] content; 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 977ab046..a4a24c7f 100644 --- 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 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 6da8d90a..0b955abf 100644 --- a/server/user.mediacube.gui/pages/menu.zul +++ b/server/user.mediacube.gui/pages/menu.zul @@ -22,7 +22,7 @@ -