Mercurial Repositories > eric / file diff

--- a/eric7/Graphics/UMLDialog.py	Fri May 21 17:54:15 2021 +0200
+++ b/eric7/Graphics/UMLDialog.py	Fri May 21 18:01:11 2021 +0200
@@ -265,18 +265,13 @@
                     return
             filename = fname
         
-        res = (
-            self.__writeLineBasedGraphicsFile(filename)
-            if filename.endswith(".e5g") else
-            # JSON format is the default
-            self.__writeJsonGraphicsFile(filename)
-        )
+        res = self.__writeJsonGraphicsFile(filename)
         
         if res:
             # save the file name only in case of success
             self.__fileName = filename
     
-    # TODO: eric7: delete the current one
+    # Note: remove loading of eric6 line based diagram format after 22.6
     def load(self, filename=""):
         """
         Public method to load a diagram from a file.
@@ -406,42 +401,42 @@
         
         return True
     
-    def __writeLineBasedGraphicsFile(self, filename):
-        """
-        Private method to write an eric graphics file using the old line
-        based file format.
-        
-        @param filename name of the file to write to
-        @type str
-        @return flag indicating a successful write
-        @rtype bool
-        """
-        lines = [
-            "version: 1.0",
-            "diagram_type: {0} ({1})".format(
-                self.__diagramType.value,
-                self.__getDiagramTitel(self.__diagramType)),
-            "scene_size: {0};{1}".format(self.scene.width(),
-                                         self.scene.height()),
-        ]
-        persistenceData = self.builder.getPersistenceData()
-        if persistenceData:
-            lines.append("builder_data: {0}".format(persistenceData))
-        lines.extend(self.umlView.getPersistenceData())
-        
-        try:
-            with open(filename, "w", encoding="utf-8") as f:
-                f.write("\n".join(lines))
-            return True
-        except OSError as err:
-            E5MessageBox.critical(
-                self,
-                self.tr("Save Diagram"),
-                self.tr(
-                    """<p>The file <b>{0}</b> could not be saved.</p>"""
-                    """<p>Reason: {1}</p>""").format(filename, str(err)))
-            return False
-    
+##    def __writeLineBasedGraphicsFile(self, filename):
+##        """
+##        Private method to write an eric graphics file using the old line
+##        based file format.
+##        
+##        @param filename name of the file to write to
+##        @type str
+##        @return flag indicating a successful write
+##        @rtype bool
+##        """
+##        lines = [
+##            "version: 1.0",
+##            "diagram_type: {0} ({1})".format(
+##                self.__diagramType.value,
+##                self.__getDiagramTitel(self.__diagramType)),
+##            "scene_size: {0};{1}".format(self.scene.width(),
+##                                         self.scene.height()),
+##        ]
+##        persistenceData = self.builder.getPersistenceData()
+##        if persistenceData:
+##            lines.append("builder_data: {0}".format(persistenceData))
+##        lines.extend(self.umlView.getPersistenceData())
+##        
+##        try:
+##            with open(filename, "w", encoding="utf-8") as f:
+##                f.write("\n".join(lines))
+##            return True
+##        except OSError as err:
+##            E5MessageBox.critical(
+##                self,
+##                self.tr("Save Diagram"),
+##                self.tr(
+##                    """<p>The file <b>{0}</b> could not be saved.</p>"""
+##                    """<p>Reason: {1}</p>""").format(filename, str(err)))
+##            return False
+##    
     def __showInvalidDataMessage(self, filename, linenum=-1):
         """
         Private slot to show a message dialog indicating an invalid data file.