Qualcuno va d'accordo con Git e GitHub?

[Sjuanez]

Grazie webmaster per essere passato. Io piano piano inizio a capirci di più.

Ho bisogno ancora di qualche giorno per rivedere il funzionamento di Git, ma credo che l'errore sia nel processo che usiamo io e Davide per implementare i miei commit. Proprio come hai descritto tu nell'esempio.

In pratica si viene a creare un "semplice" accavallamento di commit.

Esempio: Davide modifica il file download e io poi gli mando una modifica che invece è basata sulla vecchia versione.

Poi nel momento in cui si fa un aggiustamento manuale del conflitto. Per qualche strana ragione, facendo un "diff" il suo nuovo file mi appare completamente diverso. Io devo ovviamente fare un merge dei cambiamenti che ha fatto davide e da li proseguire.

Ma il merge da conflitto pure a me, quindi finisco per generare un file diverso se lo sistemo manualmente. Forse è il caso di scaricare integralmente il RAW di Davide in queste occasioni, per tagliare la testa al toro?

In tutti i casi, è compito mio fare un merge delle commit di Davide prima di lavorare al codice.

Ora, sia con il libro che con altre fonti (lynda.com e il link del buon angus), sto approfondendo l'argomento e tutto diventa via via più chiaro.

Grazie ancora per l'interessamento e visto che non ho ancora avuto occasione di farlo:
grazie per EY!

Saluti

[Sjuanez]

DarwinNE, quando hai un attimo mi manderesti per cortesia il risultato di questo comando dalla branch del sito nella tua repo?

Codice: Seleziona tutto

git log --graph --oneline --all --decorate

Insomma quello che facevamo era generare conflitti dovuti all'accavallamento di modifiche. Ora sarà bene che tu accetti, come ha detto webmaster, solo merge ff (fast forward). C'è proprio l'attributo da aggiungere al comando merge --ff-only (mi pare) che ti fa fare il merge solo se è possibile il fast forward.

--ff-only
Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward.

Sequenza che genera guai:

Sorgente FidoCadJ | Ingrandisci | Cos'è Fidocad

Qui noti come mentre io faccio le mie modifiche, tu fai le tue. Ovvio che quando cerchi di fare il merge Git non sa quali tenere e ti genera il conflitto.

Sequenza salva ulcera:

Sorgente FidoCadJ | Ingrandisci | Cos'è Fidocad

Questa è la famosa FF che sarebbe il merge di una commit cronologicamente successiva alla tua. E nel frattempo tu non hai lavorato ai file. O meglio: è mia responsabilità prendere la tua versione più recente prima di mandarti la mia commit.

La tua responsabilità, se vogliamo facilmente evitare guai, è quella di applicare solo merge ff.

Per il momento l'ho capita così, continuo a studiare...

[DarwinNE]

Ecco il risultato del comando, un po' complicato perché ci sono anche i commit nella branch master:

Codice: Seleziona tutto

* d0e7bf8 (origin/master, origin/HEAD, master) Add a Checklist rule to increase legibility of if blocks following a condition which spans over multiple lines.
* 96c6fdc Add a rule about right curly braces after classes, interfaces and methods.
* 09e4719 Improve compliance to JavadocPackage rule in Checkstyle.
* cb4e7df Add a rule to Checkstyle to verify that every class is documented with Javadoc.
* 1a49ff7 Improve compliance with Checkstyle rules.
* 1d9ba0f Continue checking of line lenght and indentation thanks to Checkstyle.
* 62e9ea3 Update the README, remove website files from this branch (they are in gh-pages).
* 7cae4a2 Add an indentation rule to rules.xml for Checkstyle and corrected many warnings...
* 472e374 Improve compliance to coding rules.
* d42385a Get rid of remaining tabs in source code.
* cba4070 Introduce an XML file which will contain code rules (rules.xml) employed by checkstyle. Begin to employ 4 spaces instead of tabs to be sure that files appear correctly in any situation (including on GitHub, where tabs are rendered with 8 spaces).
* 385746e Updated date to 2015 in the language resource files.
* c5b8b61 Removed a pair of PMD warnings.
* 8cbcf59 Further refactor ElementsEdtActions, no more considered a God class by PMD.
* c79ec14 Check the interface of AddElements and corrected a little the javadoc.
* 9c1bf19 Begin to refactor ElementsEdtActions class. Introduced AddElements class.
* 40328ff Further refactor of EditorActions class.
* dd7d532 Refactor classes EditorActions and DrawingModel, add class SelectionActions, which handles the selection operations to a lower level than EditorActions.
* a164f3a Added the ProcessElementsInterface code to the Android version.
* 0e241ed Refactor here and there. Start to use pmd cpd (Copy Paste Detector).
* 3cc370d Refactor DialogExport a little.
* e45a8fb Shlightly refactor FidoMain.
* 5555877 Updat the count script, which was obsolete.
* 41ebb81 Refactor and improvements.
* fcd13ea Configure .gitignore, add the program icon in the repository, refactor a little FidoFrame.
* 5ea80a8 Further refactor FidoMain class.
* 709b588 Refactor FidoMain class.
* 780ba6f Refactor here and there.
* d998c3d Moved some code from FidoFrame class to FileTools.
* 1fc02d6 More refactoring of FidoFrame. Move the drag and drop code to DragDropTools class.
* cd9169a Moved event handling code from FidoFrame to MenuTools classes.
* f944c2a Correct some bugs.
* 8683dec Get rid of some PMD warnings.
* d26b1d7 Refactor of FidoFrame class, created PrintTools handling print operations.
* 6112c84 Polish and comment a little ExportTools class.
* 85cc673 Start refactoring FidoFrame class: extracted ExportTool class.
* eb0cab8 Move the graphics package under net.sourceforge.fidocadj on both Swing and Android versions of the app.
* 0aaaf65 Eliminate some PMD warnings. Updated some tests.
* ec0ff56 Make more robust the access to glyphlist.txt by the PDF export.
* 1de0379 Correct a typo in the README.
* 1a8fd7a Add the glyplist.txt file to the distribution. Refactor the command line option parser by introducing the CommandLineParser class.
* 8d683e4 Review of MacroTreePopupMenu class.
* 7986069 Eliminated a couple of warnings from PMD, updated version number to 0.24.6 alpha.
* 7bada17 Checked and described some code in ExpandableJTree class.
| * 45e743e (HEAD, origin/gh-pages, gh-pages) Merged PR.
| * 15e9f6a Merged the PR from MigthyThor.
| * d8c56bd Resolved conflict with README
| * 7ebfb5a Removed the manual directory, a leftover from a merge with the wrong branch (master).
| *   f288cdd Resolved conflict with download.html
| |\ 
| | * a60ea23 FAQ page list index mobile view margin fixed
| | * 673203c Canonical link added
| | * 1bc820d FAQ page - quick link style fixed on request
| | *   fa64c35 merged from DarwinNE
| | |\ 
| |_|/ 
|/| |   
* | | 11699ec Updated the user manual in English language.
| | * 18153fc fix
| | * cc65656 Saved new readme from DarwinNE
| | * 7e69f49 Added Header/Content/Footer page template
| | *   1cb2222 Merge remote-tracking branch 'DarwinNE/master' into gh-pages
| | |\ 
| |_|/ 
|/| |   
* | | 9296e17 Updated the readme file, Sourceforge to GitHub, svn to git.
| * | 25d7c3f Resolved conflicts with code provided by MigthyThor.
| * | 0a1743d Changed the link for the manual to the updated manual in the GitHub release.
| * | c1fe369 Updated links in the download page to point to GitHub release, added a phrase about the migration from SF to GH.
| * | 637cbcb Changed the jargon in a phrase in the FAQ to a more Git-style.
| * |   96607d6 Merge pull request #9 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 11eb7d5 Added Meta tag "description" to all html pages
| * |   9a9a5e3 Merge pull request #8 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 2ae6aeb Images arrangement and classification
| * |   b46a328 Merge pull request #7 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 1110057 Faq page navigation improvement
| * |   6f693de Merge pull request #6 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 0e79076 Class "titlepage" converted in ID "titlepage"
| * |   aa8445d Merge pull request #5 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 75dede4 Class "main" converted in ID "main"
| * |   c832fa1 Merge pull request #4 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 462cb5c Menu label "About" changed in "Home"
| * | 3910872 Create Test.php
| * |   da9e6e9 Merge pull request #3 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 5cec052 Added the favicon on the page
| | * f3b13de Created a favicon
| | * 38c7859 Title typo fix
| | * 06bf62d "Symbols" was lower case in Title
| | * 14de13e Page scrn.html Title attribute edited (file name change is suggested)
| | * ffee9c7 Revert "Page downloade.html Title attribute edited (file name change is suggested)"
| | * d4874e8 Page downloade.html Title attribute edited (file name change is suggested)
| | * f95d6fd Page libs.html Title attribute edited (filename change is suggested)
| | * 74b19df Page index.html Title attribute edited
| | * 998ace8 Page faq.html Title attribute edited
| | * 5e1e15d Page examples.html Title attribute edited
| | * 2e2fade Page download.html Title attribute edited
| * |   84ab7f4 Merge pull request #2 from MigthyThor/gh-pages
| |\ \ 
| | |/ 
| | * 0b7588b CSS code clean up
| | * cbfbfbf Code Clean Up on scrn.html page
| | * 06e0196 Code Clean Up on libs.html page
| | * 2b26165 Code Clean Up on index.html page
| | * 6a7c768 Code Clean Up on faq.html page
| | * efa2e61 Code Clean Up on examples.html page
| | * f2cd571 Code Clean up on download.html page
| |/ 
| * 9e675e3 Changed one reference to SF to GH.
| * 2a1d3d8 Tweaked the GitHub logo size.
| * 7cc6a97 Changed the link to the project page to point on GitHub.
| * a178a86 Rewrote the README to be related to the website in the gh-pages branch.
| * 743c38a Cleaned the gh-pages branch from source code.
| * 820347d Website tryout
| *   ea0f07f Merge branch 'gh-pages' of https://github.com/DarwinNE/FidoCadJ into gh-pages
| |\ 
| |/ 
|/|   
* | 7b63c1d Changed the project page in the README to point to GitHub.
* | b7e4206 Updated the version of FidoCadJ for Android linked by the website: 0.24.5 kappa.
* | 4a19bfd Improved website rendering on mobile phones.
* | 2591a7a (tag: v0.24.5) Version 0.24.5 with website updated.
* | 131942e New strings translated and commented
* | f231d5c Corrected an issue in the parser: when a line contains an error the following one was not parsed at all.
* | c04fc03 PDF export now supports UTF-8 characters, with some limitations.
* | 7ba3df8 Added sanity check for file extensions during command line exports. Added the -f CLI option to skip the test.
* | 8d76f5f Completed translation.
* | 1dc679f Forgot a file in the previous commit. Added two libraries in the collection available on the website.
* | 4073689 Updated the version to 0.24.5 kappa, added the EY library to the Android application.
* | 5ea9c63 MessagesBundle_es.properties update
* | cce1ea0 EY Libs 22-02-2015
* | cd1fe96 Fixed ground symbol name and electrical earth name
* | 9ac33cc Updated the download page of the website.
* | 645fd31 Implemented the 'duplicate' command. Associated Ctrl+C to it and Ctrl+G to the code editing (feature request #31). Some menu code refactoring.
* | 886f31f EY_libraries_v01.02
* | 99ecf96 EY_libraries_v01.01
* | 0d63080 Added the EY lib to the internal libraries.
* | bf4f919 EY_libraries_v01
* | 3274967 Updated and corrected NEWS.txt file.
* | 5f60ec7 Tried to solve bug #62
* | 820fad1 Android: version 0.24.5 iota.
* | 0d3ab30 Swing: added some comments to methods of the class CircuitPanel, a little cleanup of blank lines, removed println messages no longer useful.
* | 27e5db5 Android: now FidoCadJ is associated to .fcd files in file browser (intent registered).
* | 2cbff27 Android: limited refresh of layer state in the layer list after an editing operation (it seems to work only once).
* | 5e8d410 Android: added a new icon by Elettrodomus, tweaked menu appearance.
* | 8c1ecab Android: layer spinner corrected in the parameters editor dialog.
* | b0e32f8 Android: implemented the layer editing dialog.
* | 4e6864d Android: Tweaked the code for editing layers settings.
* | ac273ef Fix coding style
* | 1c974fb Changed the zoom trigger with MacOSX to Command+Wheel, instead of Ctrl+Wheel.
* | 5bb2439 Implemented feature request #40
* | d1d661d Moved the globals.* packages towards net/sourceforge/fidocadj.
* | 79e6039 Moved the globals.* packages towards net/sourceforge/fidocadj.
* | 3433236 Moved the geom.* packages towards net/sourceforge/fidocadj.
* | b277ce1 Moved the primitives.* packages towards net/sourceforge/fidocadj.
* | c9435a7 Android: Removed old circuit.* package source
* | 3501e72 Cleanup output dirs
* | 28ad340 Moved the circuit.* packages towards net/sourceforge/fidocadj.
* | 16b5397 Small correction to the clean script, to allow the compatibility with MacOSX systems.
* | 28af6bc Moved the layers package towards net/sourceforge/fidocadj.
* | 9fd052b clean and createjar scripts improved
* | 513b058 Compile using java 7 and fix file fidocadj.desktop
* | 840d1e6 Some minor tweaking here and here. Checked the style consistance of some source files. Completed some missing comments.
* | 996328e Moved the export package towards net/sourceforge/fidocadj. Corrected some of the build scripts.
* | abf1e98 Android: generated the user interface for the layer editing dialog.
* | 78c05e0 Android: now the layer dialog allows to toggle the visibility status of each layer.
* | 877d9da Tweaked the website index page, added some comments in a dialog of the Android version (layers), in preparation for a layer editor.
* | c55f4a7 Android: added the license notice to a few classes in the net.sourceforge.fidocadj.dialogs package.
* | e891382 Swing, Android: moved the dialogs package under net.sourceforge.fidocadj.
* | 3d56c23 Swing, Android: moved the undo package under net.sourceforge.fidocadj.
* | dcbd375 Swing: moved the clipboard package under net.sourceforge.fidocadj.
* | cf1386b Swing: moved the timer and the toolbars packages under net.sourceforge.fidocadj.
* | 19880a1 Website: Added the license indication to a downloadable library.
* | 7c3ef8b Forgot to svn add a file in the last commit...
* | 807f76f Added a new user library (by mir) to the website.
* | 1394156 Some small corrections to the en manual and improved class documentation.
* | 1307940 Updated the user manual in English.
* | d578279 Faster distance calculation from splie curves (muuuuuch faster with Android, in particular).
* | 8d866be Swing added jar/fidocadj.jar to the repository.
* | 7f5ff0c Swing: improved handling of Control and Command (meta) keys with MacOSX in order to improve user experience.
* | e5eca7a Working a little with PMD and refactoring here and there.
* | d515dc6 Code cleanup, reread, improvement of some comments, etc.
* | 9cd1d57 Android: now the user libraries in the FidoCadJ/Libs directory are loaded at the app startup.
* | ffc1451 Android: we try to read external libraries in the external storage, in FidoCadJ/Libs. Still not working properly (need to adjust CustomDrawerLayout, probably).
* | 82544c8 Android: FidoCadJ/Drawings and FidoCadJ/Libs are created the first time FidoCadJ is run, on the external (SD) storage of the Android device.
* | fc63e08 Improve w3c markup validation for some pages of the website.
* | 81c0599 Improvements to the website, proposed by Emanuele and Federica.
* | e35256e Implemented some useful suggestions to the website. Thanks to Emanuele and Federica.
* | 454146a Reorganized the website into several pages.
* | 1509b89 Begun to add several pages to the website.
* | eb69ba9 Website now passess the CSS and HTML validation
* | 1e394a3 Revamped a little the website.
* | b7abf7c The website is now included in the SVN repository.
* | 47da404 Android (0.24.5 theta): added a button for the scroll/zoom state. Small improvements here and there.
* | dbf0f87 Updated version number to 0.24.5 eta, worked a little bit on the general README file.
* | 4373a11 Android: now the zoom gesture controls much better the positioning of the viewframe.
* | 7254eb4 Android: zoom to fit centers viewport on drawing.
* | b96f739 Refactored export.GraphicExport class so that all code related to drawing size calculation has gone in the new geom.DrawingSize class. Android: added a zoom to fit button in the menus, but it does not yet center the view once the zoom factor is applied.
* | e7fb40d Android: now the response to the zoom gesture should be more precise.
* | 23dca4b Android: Added some icons kindly prepared by Elettrodomus, from ElectroYou.
* | 3fa84f1 Android: Took into account some of the messages of PMD. To be verified.
* | 1a12a69 Android: show the current layer color in the toolbar.
* | 50772b0 Android: added a PMD script to perform static checking of the code.
* | 6a92f89 Corrected text resources, tweaked coding style of some classes of the Android application, adjusted layer names in the Android app.
* | d7fc2aa Added saving and opening to SD card
* | 1666711 Android: put all the DialogParameters contents into a ScrollView widget. So if the available area is small, one can easily scroll the dialog.
* | d1146ac Android: adjusted sizes for small and medium screens
* | c2bd150 Tweaked some details about Android API level (restored to 14), corrected a bug with the connection primitive, tweaked some documentation, improved grid visibility on some Android devices.
* | b2f3e4f Added building instruction for Windows
* | d7a03fc Android: updated foreground and background colors of buttons in the DialogParameters View.
* | 55f66b3 Android: Handled Nexus S and similar.
* | 3f04c97 Android: increased the number of handled screen resolutions and sizes.
* | 9368e5a Android+Swing: Now the size of the handles and the grid dots depends on the screen resolution (dots per inch) and should be adeguate for very high resolution devices.
* | ce24cb4 Android: Now the app saves the state of itself.
* | 054de95 Android: libraries are shown in Italian language if the local language is Italian.
* | 090e2a0 Android: the library drawer is closed once a symbol has been selected.
* | 545111a Android: increased allowed zoom range, now it is the same of the Swing application.
* | b42e87b Android: arrow for the library drawer now points towards the drawing.
* | 45594bf Android: Some tweaking about the app name and updated the NEWS.txt file.
* | e9cceb6 Android: supported 4.7'' devices.
* | 3a2370f Android: Added CellDash and the DashArrayAdapter, moreover some other embellishment.
* | 0f3c163 Moved cz to cs locale resource file.
* | 55e7d75 Restored command line option -k to show current locale (probably, the corresponding code was lost during a SVN merge).
* | 200c338 Translated : senzor gestures..., no file...
* | f745079 Android: DialogParameters now saves the editing results even if the screen is being rotated while it is active.
* | 30f27b8 Android: saves the selection state of the objects when rotating the screen.
* | 1f663a7 Corrected a typo in the resource files.
* | 19c8cf7 Android: added some phrase to the properties files.
* | e92a1a8 Android: Delete file option.
* | 4f47d99 Android: Allows to activate or deactivate the gyroscope gestures to rotate and mirror objects in the drawing.
* | 8436d1b Android: A little refactoring of FidoMain class and added code for a more complete saved and retrieved instance.
* | fa5ebd0 Android: Now the 'snap on grid' option can be deactivated.
* | e1c737e Android: Efficient grid drawing, tweaked some code. Menu item for toggling on and off the grid. Added a sort of an arrow in the drawing area, to suggest the presence of the library drawer.
* | 02e6e5e Android: the redraw now takes care of calculating clipping areas in order to greatly increase the speed when only a partial redraw is needed.
* | e8c4ab7 Android: New version of drawAdvText exploiting transforms on Canvas object and not using drawTextOnPath anymore.
* | fbb07d7 Improved the comments of the GraphicsAndroid class.
* | 9dd1755 Rolled back to r772
* | 4a1621d Android: Added, previously forgotten Globals class.
* | 9cd5bf0 Android: Fixed the text rendering over the tools panel, while scrolling.
* | 3a5293e Android: Added the dialog layer that allows to select the current layer.
* | ff29b5a Android: corrected the file extension, introduced more screen sizes for calculating the dialog size for DialogParameters.java.
* | 0623f90 Android: Implemented the new and save functionality.
* | a5f54f1 Android: Managed the file opening and the saving with name.
* | f4b40da Android: add the forgotten files.
* | a5d960e Android: implemented saving files, and more others features...
* | a803f70 Band-aid for bug#54.
* | fe09188 Android: improved the DialogParameter's usability.
* | fedfc45 Android: now the DialogParameters supports three different screens types. Moreover the keyboard is hideable easily.
* | cde720d Android: organized libraries and symbols in a better way.
* | da8a18d Solved bug #56.
* | 1f5c9c3 Android: beautified the dialogParameters.
* | 9b7fd8c Fixed problem of LibraryModel doesn't save library when copying macro.
* | 1c2ed9f Android: customized the ArrowInfo spinner's items.
* | 5b7c162 Android: Improved the scroll limits.
* | 3627f15 MessageBundle_es.properties updated by simo
* | 46dab23 Revisioned the fidocadj-installer-linux.sh.
* | 9c26fdb Android: Deleted the zoom and scroll buttons, improved the zoom handling.
* | 31541c4 Updated the NEWS.txt and README files and tagged version 0.24.4
* | fddbd8a Added the --restore [VERSION] option at the fidocadj-installer-linux.sh
* | 55c114e Fixed MacroTree CellRenderer problem on Linux.
* | b062352 Updated the bundle for MacOSX, to use Java 7.
* | 7d85dee Solved an issue for Linux.
* | c63b15d Android: implementation of the zoom multi touch handler, works.
* | e56fb94 Documented all the packages of the Swing application, with Javadoc.
* | 46bbb1e Android: selection of macros from the list is now possible.
* | 6ecc1f9 Android: Added some files I forgot and resolved a conflict on main.xml layout file.
* | 23ab158 Android: Added the zoom button on the pannel, and the multitouch zoom manager.
* | 4ad8abf Android: Put the Expandable list in a CustomDrawerLayout.
* | 7589a80 Android: saving the actionSelected's state, while screen rotation.
* | 10ed970 Android: corrected the handling of the drawn objects, after scroll actions.
* | b66d435 Corrected some issues found by PMD and FindBugs.
* | 05b2eab Android: improved the handler of scroll events...
* | fcc3d42 Android: moved the 'move' icon in the same position as the Swing application.
* | 420eba5 Android: implemented ScrollView on the FidoEditor view...
* | f1650f5 Updated the german translation of the user interface.
* | b12ea79 Translated : new macro, library and category strings...
* | 212554a Part of the Spanish translation, thanks to Simo85.
* | de600e2 Android: the list contains installed libraries and symbols (but still lot of work to be done).
* | 5b67a3d Removed some hardwired string and directed towards resources.
* | 2819117 Android: saved the drawing while screen rotation.
* | cbd6044 Tweaked some details and added a getParserActions method to FidoEditor class.
* | 4574d3d Parameters for the text primitive does not include anymore the control point.
* | 584454b Android: It's now possible to change orientation, when is visualized a DialogParameters window.
* | 29fd16a Android: filtered the integer input fields and some other improvement in to DialogParameters.
* | d0d40cb Android: added the standard libraries to the resources of the application.
* | 09ea9cb Android: added the custom ListAdapter for the layers spinner.
* | 44f4814 Android: added layer_spinner_item.xml
* | 9e3833d Android: Added the forgotten LibUtils.java
* | 74c7827 Android: improved the DialogParameters.java
* | a66309d Android: added an ExpandableListView which will contain the library elements.
* | 5d98348 Android: improved text rendering in some cases. Linked some classes about the library tree to the Android directories.
* | 4f362de Implemented the spinner views.
* | 3c6a86c Android: corrected some details about text rendering.
* | 59aade9 Android: Activated the link between DialogParameters and the drawing database.
* | d77d355 Improved the test for export such that we do not have a false positive each time FidoCadJ version number changes.
* | 8d0a10d Partially connected a nasty bug correlated to text included inside a mirrored or rotated macro.
* | 1a8b013 dialogPar, work in progress
* | 8ed17ac Commented license in first.
* | cce292a Swing: I got rid of a few instatiations of GraphicsEnvironment which were not useful in the DialogParameters class. Added a screenshot of the Android app.
* | a7ae797 Improved createdoc script (thanks to a suggestion from Kohta).
* | c6af254 Fixed drawing offset calculation of DialogSymbolize. Fixed key class for Preferences of LibUtil temporary. Fixed import of old MacroTree for compiling.
* | 754d09f Arranged packages.
* | f5de5dc Swing: Improved layer change (problems with macro text solved). Got rid of circuit.ScrollMoveListener and hopefully improved the centering during the zoom operation. Version 0.24.4 delta.
* | 8e9ac1f Translated : Choose_browser
* | a6a6a3e Swing: the layer of multiple selected objects can be selected just by clicking in the wanted layer on the toolbar. Preliminary version FidoCadJ 0.24.4 gamma.
* | 8da50a7 Android: access the DialogParameters via the menu.
* | 269267e Corrected an issue with the preview panel.
* | 45f50ab Some changes at the DialogParameters
* | f3ef8db Corrected an issue to programmatically access string resources in Android.
* | d761db9 Added new string and modified miss translated string in Japanese.
* | db23bba Android: provided some code to launch DialogParameters at the correct point.
* | da481ec Propagated Choose_browser resource to all resource files (and translated it in Italian and French language).
* | a0d5840 Fixed a little string problem
* | ba440b2 Added the DialogParameters, and some other improvements
* | 8cf94ba Android: implemented text rendering.
* | 146bb6c Android: Gyroscope actions to rotate and mirror selected objects.
* | 446e355 Android: corrected a remaining reference to an old package. Introduced undo/redo functions on the drawing.
* | 00e9a82 Android: removed test package.
* | 243a91b Android: removed davbucci package.
* | e44ba51 Introduced the package net.sourceforge.fidocadj to contain the starting point of the applications. Tweaked a little the zoom functions for the Swing application.
* | b1463ed Android: changed the name of the starting point package.
* | 34b4f64 Android: implemented some menus and tweaked editor actions. Swing: release of preliminary version 0.24.4 beta.
* | 4555e44 Android: forgot to put two links to classes under revision control...
* | 246c3ac Swing app: refactored CopyPasteActions.java. Android app: implemented copy/cut/paste actions in the context menu.
* | 5955967 Android: adjusted a few details (resources) and tweaked some small things in the code.
* | 301b22d Android: added the generated resources to the SVN, added a ContextMenu with some editing actions.
* | 0a7b8f8 Added the possibility to change the layer of more than a selected primitive at once in the Swing application.
* | 0f7a686 Merged Kohta's branch with trunk. Now we should continue the main development in trunk.
* | b88e27b Changed the credits for the software. Now they are given to all the FidoCadJ development team, and not only to myself (D.B.)
* | a5eac6c Swing app: Corrected a bug which prevented adding and removing points to a curve or a polygon. Android app: changed the name of a class in order to be more relevant to the context.
* | 52e1d0d Android: added a way to end introduction of lines, PCB lines and curves wit a double tap.
* | 3eca3c9 Added the dimension res. file
* | 22d591f Added a script that makes layout for different screen
* | 7f5e3c3 Added a way to visualize taps when entering new elements while editing with Android. I noticed that in this version, Add and Remove a vertex does not work anymore with polygons in the Swing applications. I think this is something due to the refactoring done a few weeks ago. I should check that.
* | b6f1eff fixed the portability problem of res.sh
* | df0a350 Updated fidocadj_pmd.html
* | d924bc6 Corrected some small issues here and there (now Swing application can be compiled again, tweaked some Android resources).
* | 6a31068 Added some comments. Fixed some code indicated by PMD.
* | 40b3289 Added the DialogAbout
* | 65b5db8 Added the DialogAbout
* | 3e0a67a Improved the android development scripts
* | 226210b Moved the android scripts into OSes/android/test/
* | 719d3e0 Activated some actions on the toolbar of the Android application.
* | a8a9827 Tweaked some details concering resources sharing between Swing and Android applications..
* | 9c3ee77 Moved the android scripts into OSes/android/test/
* | 0ea8084 Some serious editing possibilities are now possible in SELECTION mode with Android. Probably, handles are a little too small for being used with fingers.
* | e3a1896 Update README and NEWS.txt files, restored src/FidoFrame.java to Kohta's version, tweaked executable flags of Dante's scripts.
* | 9fd8d6b Added some forgotten sources. Added some comment(partial). Added some code using existing language resource. Fixed few code indicated by PMD.
* | 877dc76 MacroTreePopupMenu uses now language resources.
* | f761e35 Implemented stopgap save and undo. Fixed change key bug.
* | 15aca1c Updated README file and PMD results.
* | 5f5befc Improve macro selection behavior: NewMacroTree.java
* | 209938c Modified for library operation: AbstractMacroTreeNode.java Category.java Library.java LibraryListener.java LibraryListenerAdapter.java LibraryModel.java MacroTreeModel.java MacroTreePopupMenu.java NewMacroTree.java
* | c7e9eb5 Add the scripts for create Android resources
* | 0d48e72 Restore previous version.
* | a88b374 Add the scripts for create Android resources
* | b9f0e56 Some kind of basic interaction with handles is now possible with Android. Simplified some code here and there.
* | e79081c Selection of elements made possible on the Android application. Corrected an error in the distance calculation for filled ovals.
* | e6efe3a Other code extracted from circuit.CircuitPanel and moved to circuit.controllers.ContinuosMoveActions.
* | 5d28dc3 Moved some code from circuit.CircuitPanel to circuit.controllers.ElementsEdtActions.
* | 8af6084 More code refactored from circuit.CircuitPanel class in order to make it usable elsewhere for editing purposes.
* | de82392 Created the new controller ElementsEdtActions, to refactor part of CircuitPanel. The width of a PCBLine is internally stored as a float, instead than as an integer.
* | 45008c0 Corrected the Android version. It should be compiled correctly now.
* | 9632d6e First version of the Android application, able to parse and show FidoCadJ code. Text is still missing, but the results are decent for the other primitives. Tweaked a little the Swing application to improve compatibility and code sharing.
* | 52b63b4 Moved some of the export methods as a new classe in a separate view.
* | dfe8691 Correct size calculation of text primitive with graphic.nil classes (but they depend on Swing).
* | daf5915 Experiment for a more efficient calculation of the drawing's size.
* | ca93455 Moved all Swing-related adaptation classes to a specific package graphic.swing.
* | 9336f6c Now all graphic primitives are no longer depending directly on java.awt classes. Loss of performances seems to be acceptable.
* | 1e8caa2 Continued to tweak classes to decrease dependency to java.awt.*. Improved javadoc, PMD and FindBugs reports.
* | 34b632f Tweaked some details to reduce false positive PMD warnings.
* | 0223942 Further increased orthogonality of the primitives with respect to java.awt classes (wrapped in the graphic package).
* | 918e39c Further increased orthogonality of the primitives with respect to java.awt classes (wrapped in the graphic package).
* | 4920fd2 Got rid of a few PMD warnings.
* | 02369b3 Removed some dependance to java.awt.BasicStroke on the graphic primitive classes.
* | 1ed9531 Added wrapper and interface for java.awt.Polygon. Tweaked the code here and there. Checked with PMD and FindBugs.
* | 5c0d6f3 Some tweaks here and there.
* | 66fb514 Some tweaks here and there.
* | 9438f50 Implemented DimensionG class.
* | bf12641 Got rid of java.awt.Point in the implementation code.
* | 837c87c Reduced dependency on java.awt classes in some parts of the code. Improved some comments.
* | ff91d99 Started adapting java.awt.Color to ColorInterface to reduce code dependency on java.awt.*.
* | d4a35f3 Encapsulated java.awt.Graphics2D into graphic.Graphics2DSwing class implementing graphic.GraphicInterface class. First (big) step towards Android compatibility, where java.awt.Graphics2D is not present. Some AWT classes still remain here and there.
* | cfe1da8 Better zoom calculation when selecting preview of components. Got rid of a few unuseful IOExceptions in the parsing routines.
* | 3f5d9a4 Now FidoReadApplet should compile correctly.
* | 769efdf Created some new packages to give the structure of the code organization.
* | c90539a Big refactoring of DrawingModel class. Introduced two new controllers, ParserActions and UndoActions to modifiy DrawingModel.
* | 788db19 Forgot to do a svn mv.
* | a16e0e8 Changed the name of an important class: ParseSchem becomes DrawingModel.
* | 1fa1cf5 Introduced a new controller, for manipulation of handles.
* | 7aa2bda Refactored ParseSchem and a little bit of CircuitPanel: towards a design which is more oriented towards the model/view/controller pattern.
* | 1c0651b Started refactoring ParseSchem.java. Drawing operations should not be in this class.
* | b0d9d32 Started refactoring ParseSchem.java. Drawing operations should not be in this class.
* | 741b8fb Improved bad smells here and there.
* | 3bf3b95 Slight refactoring of CircuitPanel, some improvements here and there.
* | f571203 Scanned the whole code with PMD and Findbugs once again, corrected some issues (few minor ones, and one not-so-minor one).
* | 1e6bfb5 Solved a bug on selecting ovals, introduced while tweaking code.
* | c7c9bc4 ExpandableJTree.java   Separate from NewMacroTree.   Add backward selection with Shift+Enter.
* | 37e1911 MacroTreeModel.java   Fix filter word bug when words are delimited by continued spaces. NewMacroTree.java   Create customized JTree component for expanding tree with more better way.   Add cyclic selection with enter key. (only forward direction yet) NodeFilter.java   Rename to NodeFilterInterface.
* | 6e0329f Some code tweaks, again. Reduced to 198 PMD messages in total.
* | 9875073 Some code tweaks, again. Reduced to 198 PMD messages in total.
* | d0056aa Some tweaking here and there.
* | 1cbe7e0 Some code tweakings, improved ScrollGlassPane indentation.
* | 2262995 Reduced to 396 PMD messages. Most were trivial, but one or two were more serious.
* | c47fb44 First tryouts for an Android version of FidoCadJ. Just a test, for the moment.
* | 9108d54 Reduced the number of PMD messages to 500.
* | 63fa3bb Reduced the number of messages in the PMD report to 649.
* | b17a8e9 Reduced to 713 warnings from PMD. See fidocadj_pmd.html
* | afa9889 Removed a lot of compilation warnings with Java 1.7.
* | 4ac7cfc Adjusted the encoding of several source files to UTF-8
* | 161796d Add comments and fix code style. with AStyle: Astyle --style=kr --indent=spaces=4 --suffix=none
* | 01a3f17 Connect MacroTree and CircuitPanel.
* | 19c7d4f Modify some inheritance and some classes. Selecting, searching, previewing macro works on a trial basis. Try as a another implement.
* | 62d97b2 Begun to use pmd, solved a few minor issues.
* | 661dcae FOR THINKING ARCHITECTURE. Unimplemented functions remains and operations are different than before. No comments on source codes yet.
* | 9613f52 Suppressed some compilation warnings with Java 1.7 and FindBugs messages.
* | 7e81236 dialogs.LibraryPanel delete equals method from anonymous class for sort.
* | c852aca No need to use the 'mac' option anymore for the compilation. Macintosh operating system is detected automatically.
* | 8ba62f3 Reduced the numbers of issue found by FindBugs: 'just' 71 are remaining...
* | 5aedb86 Removed other warnings.
* | fbc48c8 Suppressed some warnings from Java 7.
* | 2073eca Removed a few warnings (compilation with Java 7 and FindBugs).
* | 77e4727 Checked the code with FindBugs and corrected some issues. Some other issues found remain to be corrected.
* | 4539bef Tagged version 0.24.3
* | 9dd4328 Release 0.24.3, unless some catastrophe happens...
* | 86a4be2 Tweaked official way of writing FidoCAD.
* | 90158d8 Center viewport when zooming.
* | 0b65f9f Some tweaks, reduced number of warnings with Java 7 (files in UTF-8).
* | 8520bc0 Corrected a bug: when the grid is changed, the drawn one is not changed immediately.
* | 9b73fde Translate Origin : Počátek and update translation Layer/Circuit : Schéma
* | 8ed3572 Updated the en manual with the new '-k' command line option.
* | 2e8039a Added the '-k' command line option to obtain the current locale.
* | 722c28d Re-read of the README file. Added some hints about language codes.
* | c34039a Small corrections on the en manual, news file and readme.
* | dc19f96 Compiled the user manual in Italian.
* | f3d58ef Fri 25/10/2013 Italian FidoCadJ Manual by Pietro Baima
* | 1b4087e
* | db83fbc Created the Kohta branch for testing refactoring of MacroTree class.
* | c8043c9 Fri 25/10/2013. FidoCadJ Italian Manual. Translated by Pietro Baima.
* | b672b11 old italian Manual Version
* | 21a04d0 Improved comments and small details on MacroTree class.
* | 0392d98 Some code refactoring, better warning message in French.
* | bfcd85f The backup of libraries for the undo is no longer recursive.
* | 72c35c0 Corrected a misfunction of the search field.
* | 39b6a07 Maybe bug #50 solved.
* | 570f73f Some comments added for library items drag&drop.
* | 005dd7c Some corrections and integrations to README.
* | d9f233e Correct README document.
* | 676caf9 Added the word 'origin' near the red dashed cross in the Symbolize dialog. Added some flexibility there.
* | 0047215 Corrected undo bug #47.
* | e9ae708 Some further steps towards a working undo.
* | ca9d95a Maybe a little better undo?
* | ff77e3c Implemented part of request #36.
* | a94d6fb Modified comments in LibraryPanel class.
* | cf3bbb0 Translated in Japanese for new strings.
* | b64b170 Created the 'simo' branch.
* | 1a7473e MessageBundle_es.properties updated
* | 4a91662 Doplněn překlad "lib_in_dir".
* | 9321d3d German translation updated.
* | 94072be Added the language resource 'lib_in_dir'.
* | 56a88a7 Updated the english manual.
* | 2d1ac48 Tweaked a few details.
* | e5b1ba0 Activated the LibraryPanel class, by ozmachine.
* | ce5a41c Doplněn překlad dvou řetězců.
* | 93c4ef0 Adjusted a few details.
* | c844081 The 'Split non standard macros while saving' modal option has been replaced by an immediate menu item. Associate text can not be set to a negative or zero text size in the options dialog. Some corrections on language resources.
* | 3acbbbb Solved some issues concering null pointer exception in spline calculation.
* | 0faad59 Updated NEWS.txt
* | 4d81fd2 Some refactoring on the spline code.
* | c8f6ab0 More accurate rendering of cubic spline curves (solved bug #36?).
* | 0f0185e Probably solved bug #45.
* | 232cff9 Probably solved bugs #43 and #44 concerning text fonts.
* | 65ac555 Some graphic tweaks.
* | 589786b
* | cbd7404 Deleted directory 'trunk fidocadj-code'.
* | a126951
* | 9ff6ac7 Bidirectional search with the return key in the macro tree, by Mancuso Raffaele.
* | 19fdb0b follow coding rules.
* | 63d4552 Tagged version 0.24.2
* | c12962e Release candidate for 0.24.2.
* | df8253a MessageBundle_es.properties update
* | 62472c9 Slight change of a misleading warning message.
* | a148402 Create branch directory_sel.
* | f4e7768 Add library list panel as JFileChooser accessory.
* | af1f140 Library symbols are now alphabetically sorted, with standard libraries first.
* | dcaf737 Change selection mode of library directory dialog.
* | 2e5143c Started to work on the en manual.
* | fdf910d FidoCadJ 0.24.2 zeta
* | 4255775 Undo system now accounts for library operations.
* | 670c656 Some improvements on the undo/redo system. Still some temp directory are left behind.
* | 1c6c125 Updated German translation
* | c7be365 Improving the undo system for libraries. Still some work to do.
* | ac687cc Improved drawing of very small connections. Paved the way towards undo of library actions.
* | 056ae38 Dutch translation, by Bart.
* | ca16a39 translated for new strings.
* | 7a1faad Corrected an issue concerning the size calculation of elements and drawings.
* | 4dda5ac Preliminary version 0.24.2 delta
* | a2d2aa7 Imprecise centering on the mouse cursor during zoom activity.
* | 2ed4a2c Split non standard macros while copy/pasting is now not modal anymore.
* | ee4d3bc Maybe solved an annoying bug with the font of text associated with elements.
* | 885801d Now one can create new components, with the correct file name for libraries.
* | 0545734 Begun to consider the file name different with the complete library name also in the DialogSymbolize.
* | af0ce1c Drag and drop in the library tree now partially works.
* | 756a0ff Avoided repeated symbols in the library file when changing the key.
* | 2f4a529 Renamed Phylum's classes, part 2
* | c9a9f7e Renamed Phylum's classes.
* | e027317 Now renaming or deleting an element works and conserves the right filename for the library.
* | 3a5cca8 Improved some low-level library routines.
* | fad0ce9 The file name is taken into account when displaying the available libraries and symbols.
* | beb702c Version 0.24.2 beta
* | cc65e22 Corrected some issues, added some sanity checks.
* | ee3ae8f More precise activation of Macro Tree popup options. Still some work to be done.
* | b9f428c Corrected an issue about split non standard macros during the copy/paste.
* | c4a5241 Popup menu in lib tree now becomes inactive when clicking on a standard library (immutable.
* | cf6ad0c Solved a modality issue with DialogParameters.
* | 8bbf396 Shows an error message when creating a new symbol without having defined an user library directory.
* | 18d9f79 The key is verified when a new symbol is created.
* | 64a2d48 Tweaked a few details about new symbols definition. Origin is now by default on a point aligned with the grid when the new symbol dialog is activated.
* | 6a44516 Solved a few bugs in the new symbol introduction.
* | d97ea00 Tweaked some details.
* | a809013 Tweaked a few details.
* | c3468c8 Making creating new symbols more reliable.
* | 3c71833 Changing the name of a group now is working correctly.
* | 2abd505 Started work on the library tree.
* | 80f8190 复制/粘贴绘图元件错开选项相关内容中文化
* | 7118a68 End of promoting phylum branch to the trunk directory: deleted phylum branch.
* | ecbfaf1 Began to promote phylum branch to the trunk directory: moved phylum branch to the trunk directory.
* | fda5ab3 Now, splitting macros works flawlessly (or at least, I hope so...).
* | 7c8b70b Much improved the origin selection while creating new symbols.
* | 3482c14 More precise determination of the origin while creating new library symbols.
* | 0f5e574 Added some comments.
* | 2c4ce4a Better positioning of a mirrored macro during vectorization.
* | fa638e7 Now, if a mirrored macro is vectorized, its orientation is preserved, even if the positioning is not yet accurate.
* | d03cc76 Updated to Quaqua 8.0
* | d971c5d Some small graphical refinements.
* | 1d3fd0d Automatic calculation of the size of the DialogParameters frame.
* | 29c07cb few changes to key and macro creation
* | 5b3a0a8 new keyb layout
* | 7666111 lib dnd now really moves macros
* | 0a6dc95 and group repeat
* | ef1f0e3 fixed a spacing issue in macro names
* | 955d4cf mtree++, origin preview
* | 5ac0461 mtree improve
* | d397c56 The symbol keyboard is now part of DialogParameters.
* | 7680c7c add Japanese translation.
* | ee979cb Tweaked the keyboard fonts and sizes.
* | b854822 Some small tweaks of the user interface for MacOSX.
* | f51a4cc tree pre-dnd ||
* | 54c75bf premilinary support for tree dnd - it doesn't actually moves anything
* | 61dee16 more about tree
* | 60ab958 tree improve
* | a1aaae7 click==2 for dp, last selected lib/grp memento
* | eaf4357 keyb fix
* | 1bf4ad1 improved keybd
* | 090cdd5 added item listener to libcmb
* | 8541a40 UTF-8 symbols escaped in dialogs.OSKeyb class.
* | 8a3ae22 added group cb in symbolize
* | 4597a4d Some comments written. Maybe solved the bug for which the Parameters dialog is shown twice with a double click with MacOSX.
* | 1207ecd Should now look fine with quaqua enabled
* | e07cb54 Added some comments in the source files.
* | b33362e keyb glued to parent
* | c85f8f2 Probably solved the bug associated to strings while selecting them in a primitive during a rectangle selection.
* | 974a5ce mod keyb pos
* | 9d9fe4f handle caretpos0
* | 54931cf
* | 2322720 fixed focus stealing
* | 44e6e84 introducing symbols keyb
* | a4e7dd3 Solved a bug associated to the selection of lonely rectangles in library symbols.
* | 56dc376
* | d31388b Strings... are fragile things... needs special handling... Strings gets damage, strings got broken :)
* | e7485bf Several changes
* | 5fa0fcb Added some code comments, tweaked some GUI elements.
* | 28b6e6c Major update - includes macrotree improvements, temporary language menu and bugfixes
* | a426dcc
* | 4d8b0cd support different encodings
* | 0383195
* | a70e7cb
* | 29d2551
* | 368a204
* | 22217cc Some slight corrections. Now the phylum branch compiles correctly (at least on my computer).
* | 541bff3 Updated to store layers info along with macros
* | 99b94ba
* | 0a14769 Features early symbols management
* | 4638036 Created a new branch for tryouts by phylum.
* | c242a47 Corrected a few details in the README
* | 1211b64 Saved version 0.24.1 in the tags directory.
* | 13f3faf Updated to version 0.24.1
* | 97775a6 Corrected an error for which line sizes are not saved correctly in the drawing.
* | 2849b08 Updated the en and the it manuals.
* | d158202 Updated the german translation of the user interface.
* | 9f50095 MessageBundle_es.properties update
* | 05d92f6 Some information about graphical file export are now saved.
* | 1ba5f49 Check and eventually auto complete the extension when loading FidoCadJ files.
* | 56bbbef The diagonal shift during copy/pasting can now be turned off.
* | 9343a16 Corrected a bug while selecting splines: sometimes one got a null pointer exception with 0.24.1 delta.
* | 3c839f7 More reliable selection of spline curves.
* | 8ecc475 Corrected some bugs, updated the automatic tests.
* | 3c33001 More precise rendering of spline curves.
* | 7cc4e0f Implemented the possibility of adding new vertices to splines.
* | 8efe865 Implemented the possibility of adding new vertices to polygons.
* | bab33eb User can now remove vertices from a spline curve, exacly as with polygons.
* | c39129f 增加节点，删除节点
* | 175d510 Completed Dutch translation (thanks to chokewood).
* | 537a18f Added two new options to the language resource files. They still need to be translated.
* | 4be8f6c Added the ability of removing points of a polygon. Still have to update the language resources files as well as upgrading the ComplexCurve primitive in order to do the same.
* | 5691273 Enabling and disabling popup menu item if there are or not selected items. Diagonal shift of selected elements during copy/pasting now performed during pasting, instead of copying.
* | e5b1477 More reliable adjust of the visible viewport during the zoom to fit calculation.
* | 59a881c Blend the green color of the selected objects with their original color.
* | 1e5e03c Added the Rotate and Mirror options to the popup menu.
* | e2c10f6 应Davide要求，加入编译好的PDF文件
* | 418e442 目录/插图/表格显示中文标题
* | d7020eb Forgot to eliminate some code devoted to a test in the english manual.
* | 15674aa Minor correction to the english manual.
* | 6a015f9
* | a5e9bc8 initial
* | e6a31f6 长方形-->矩形
* | 50ab455 Solved an annoying bug when coming back from an editing mode to a macro which was already selected. FidoCadJ 0.24.1 gamma.
* | 88d54e6 Forgot to mention the new Dutch translation of the user interface.
* | 5b37ff4 Solved a conflict due to a svn merge, improved some details on the manuals.
* | 858fb6a Corrected some details in the english and italian manuals.
* | 6f3f536
* | adc255b Did some corrections on the english manual.
* | ea81bfd 信号线-->导线；工具栏基元件的提示统一为“画...”；曲线-->样条曲线；
* | 203150b
* | 7123d7e Corrected a few details on the manuals and in the MIME-type descriptions.
* | f10dd69
* | 36ee887 shebang#!
* | a2473a9 Corrected the en and it manuals on some important details. Fixed bug #3540488.
* | eda0870
* | 41c912f get locale from either the LANGUAGE(explicit) or LANG (all_ALL) environment variable If this fix doesn't work. We gonna offer them all the docs, its not that much Mbytes more, right
* | aa58048
* | 3461422 Corrected the english manual.
* | 61795ba
* | 5de1c32 removed "tr" dependancy
* | c4c1ffe removed environment setting
* | d5466bd
* | df85188 Got rid of *a lot* of warnings about pre-Java 1.5 code style (now I use generics in the code).
* | cfc24b0 Suppressed mime type warning messages during setup, these messages have nothing to do with our script. if the users local database is incomplete they see warnings and may confuse the user if the setup went well.
* | c2c587a Corrected a few typos.
* | eb8c878 stripped unnecessary code now accepts all cli options
* | 337c1d0 stripped unnecessary code now accepts all cli options
* | 8e419c6
* | c04a78a Always install english manual by default Added future language block as comment for easy adding more native manuals Minor fix on removal
* | a1a5aa7 错误修正
* | cbcd9a1
* | d5dde95 minor change in Open (file) to a more consistant dialog : "Openen..."  as in : "save as..."
* | b3df210 Forgot to choose the correct locale for the english resources file.
* | fe742c5 Adjusted some details concerning the -l option; some diagnostic messages are printed.
* | 066eccc Corrected a few details.
* | e9d21e3
* | 0c8255c Fake root /usr/bin/share/fidocadj for the linux file system
* | d007938 gpl3 text
* | f21eee4 Fake root /usr/bin/share/doc/fidocadj/ for the linux file system
* | 60ba928 Fake root /usr/bin/share/doc/ for the linux file system
* | a10b9ca posix compliant desktop entry
* | 11502b5 Fake root /usr/bin/share/applications/ for the linux file system
* | 70e6e1b Fake root /usr/bin/share/ for the linux file system
* | 867c341 main shell executable for 0.24.1
* | b21b631 Fake root /usr/bin/ for the linux file system
* | 0aaa34b Fake root /usr for the linux file system
* | b143ff8 Fake root / for the linux file system
* | 5d6ac49 tested with 0.24.1 gamma I keep the auto creation of the users config file in it. this is more senseable thing to do on a multi-user machine with different locale needs for each individual user
* | d13397e
* | 033a956 obsolete
* | d2cc49b merged in main-linux-package
* | ab11b96 merged in main-linux-package
* | b7e0935 updated
* | 23921e3 rebuild it only now wants one tarball (see main-linux-package.tgz) and the jar file Also installs the manual according language or default "en" pdf if we cant provide the users language Update: adds mimetype extentions (and removal on uninstall)
* | 144e111 Acts as a skeleton for basicly setting up the linux installation Jar + manual + readme are live fetched from the server to get most freshly available
* | dabba40 Corrected the nome of the software: FidoCadJ
* | 0626ce5 did some work on the comments
* | c6825d6 merged in new version
* | f2cb7b0 added default.cfg for distribution testing
* | 28520ae Revision: now reads user .fidocadj.cfg if it doesn't exist it creates one from the default.cfg template file. See default.cfg
* | b2bc9aa This is the default.cfg for the users home folder, it acts as a template to create /home/[username]/.fidocadj.cfg (hidden - file) Tested on 0.24.1 Gamma 1/7/12
* | ee66d30 removed tty stub
* | 49faad8 Added help function -h --help Can now open a fcd file from the command line, need to write a mime-type for it to work in GUI
* | af4d983 Simpler Linux launcher script.
* | f330b85
* | a89e51c Completed the help section of the fidocadj-installer-linux.sh script.
* | 04760bc
* | b85ffe8
* | c09c79d
* | 79a23da
* | dfc200a
* | 52731e7
* | 9a4ec67 Archlinux only
* | 34d11c9 Renamed the Linux installer in order that 'linux' appears in the file name.
* | d8021b2 Testing
* | 89a0bab Added the -l option on the command line to force FidoCadJ using a specified locale. Corrections to the english and italian manuals.
* | d7deb6d Added some Windows related files.
* | 34eaf5f A small change in the directory organization
* | 2f3fc6b
* | 79dde1e
* | 401361a Dutch Locale
* | c270938 manual_en update 302
* | d4277a5
* | cf3f245
* | 5d2ab7d Adjusted some platform-specific optimizations (MacOSX and Linux).
* | 74e2469 菜单项中统一不使用省略号（原先省略号用于表示将会打开窗口，但FidoCadJ大多菜单项都会打开窗口，就索性统一不使用了）
* | 1ebc846 Version 0.23.1 beta
* | 9a24667 Reduced memory required for reading files.
* | 8d5e0ca Improved memory footprint and speed when opening large drawings.
* | 5daa793 Changed some details to reduce the memory footprint.
* | a4107c1 Corrected a few issues here and there. Updated export test reference results.
* | 1ff0346 Dynamic allocation of memory for polygons and splines.
* | 207f788 THIS MIGHT BE INSTABLE: open file in a different thread.
* | baabaa5 Some correction to the it manual.
* | fa44eaf Some corrections to the en manual.
* | 40e33a9 改为“放置一个电气连接点”，与手册翻译统一
* | f06a586 校对进行中...
* | bb5549c 绘图区中文不显示
* | 26210bf Some optimizations. Corrected a detail on en and it manuals.
* | 398558a Zoom to fit is twice faster.
* | 248633e Some details improved in the code.
* | 5bf64d1 Other details improved, thanks to FindBugs.
* | 534c28d Tagged v. 0.24.
* | 702433a Other coding details have been improved.
* | 6a4cd78 Started using FindBugs, improved some coding details.
* | e743e03 280更新
* | c14d8d6 Updated NEWS.txt
* | 219fbef More precise selection of close objects without names and values.
* | 3bdbc15 Added a pop-up menu showing during editing when right clicking with the mouse (feature request #3409656.
* | 4bb479f Forgot to include the new spline icon in the svn repository.
* | 151bf83 Updated some docs.
* | 7f8174f Simplified the handling of extensions: they are always active UNLESS the mode 'strict FidoCAD compatibility' is selected. Made sort that it is not possible to introduce a spline when this mode is active.
* | 04c863a The libraries stdlib, ihram, elettrotecnica, PCB are now considered standard, in the sense that their symbols are not splitted anymore, when the 'split non standard symbols' option is active.
* | f278b1e Updated a few details and the README.
* | af272f8 Added a link to the sourceforge project page in the About dialog (request #3531298). Java 1.5 now requested for compiling FidoCadJ.
* | 717d4f6
* | 2267229 Updated to v. 0.24 the English manual.
* | 07789f0 English manual: got rid of classicthesis.
* | ce9c4c3 翻译中...
* | 400a7a8
* | 87150d7 中文手册工作目录
* | 19f4db3 阅读手册后，修改误解项split_nonstandard和split_nonstandard_copy
* | 017ed61 Updated the manual in Italian. The manual style has changed and classicthesis is not used anymore.
* | 1777008 Updated the manual in Italian, but some problems with Classicthesis and the Soul packages.
* | b959e3e Updated some tests. Version 0.24, final.
* | 0202097 Much better handling of text sizes when exporting in EPS or in PDF (see bug #3529024).
* | 339107b Feature request #3524795 implemented.
* | b2b1fa4 Adjusted some details.
* | 5fbb028 Applied patch suggested by ares_fps in request #3526600.
* | db84d5a Librairies updated to UFT-8 (no BOM) encoding.
* | 726f691 Updated tests. First release candidate.
* | c5e033d Updated NEWS.txt
* | c0c996e Updated IHRAM library from v. 3.0 to v. 3.1
* | c60b14a Test updated: export curves with arrows should be complete.
* | a947276 Complex curves now accept arrows.
* | 6f1a4d1 Probably solved issue #3522962.
* | 84242f1 Changes to the icon for the complex curve primitive. Hope it is nicer than the previous one.
* | 922d278 Exporting towards the FidoCadJ format conserves the curve command CP and CV. This primitive is not converted in a polygon.
* | 6a02ba2 Better resolution when exporting curves in vector formats.
* | ed57d13 Some changes in the export structure to allow better resolution curves. The export is still not complete.
* | 70bbca6 从MessagesBundle_en.properties文件翻译过来，某些项保留使用英文。
* | aff135b New tests on the size calculation of the drawings.
* | 7a6293b Improved the test suite.
* | 652b7d5 Updated some tests, more precise export of the splines.
* | af9d5f4 Added a resource string: closed path for spline parameters.
* | 31f20fa More precise calculation of the image size when using the curve primitive.
* | bfef78f A triple-click when introducing a curve no longer crashes FidoCadJ.
* | 299e37c Now, reading UTF-8 resources is made compatible with Java 1.5.
* | 5b36bb7 Converted all the language resource files into the UTF-8 (no BOM) encoding.
* | d8aa2fd Some corrections to the complex curve primitive. Partial add to the italian manual.
* | cbc494e Curve characteristics saved. Some modifications to the CV/CP commands.
* | bb00f2a Complex curves can now be open or closed.
* | 2e38586 Some tweaks to the test suite.
* | 1805d06 Some corrections in the spanish translation.
* | c9bc40c Changed Message_es.properties
* | 5b33db6 A better icon for the complex curve primitive.
* | c883782 Probably solved bug #3484904
* | 357fe5d Now the spline curves are associated to the commands CV/CP, which are read back correctly.
* | c01c9a2 Some spline code in the trunk directory.
* | 0c63602 Oops... forgot the source directory.
* | 18b92d2 Change. First step.
* | db33a83 First spline implementation.
* | 7bb7e9b Branched the source repository in branch/export_pdf_tryouts. Some code refactorization of the PDF export implementation.
* | 3471a0d Probably solved bug #3468917.
* | 8a9c074 The FJC N layer configuration option is now briefly described in the italian manual.
* | 62edade Begun to add a new primitive: complex curve (just called it 'curve'). For the moment, I just created the toolbar icons and other stuff. It will be something like a cubic spline which can be open or closed, and thus painted.
* | c9221a5 Layer names are saved if they differ from standard ones.
* | 3251071 Added the italic text style for the advanced text primitive (feature request #3434174). Need to improve the PDF file export which currently does not implement this feature.
* | 48f5f16 Update comments about the printing resolution.
* | c7325bf Slight adjustment of the arrow style when they are associated to lines.
* | 37691a2 The lenght of the segment being entered is expressed also in millimeters.
* | 7e049a7 A little bit of formatting on some comments. Updated the version to 0.24 alpha (work on progress).
* | 1b0b84f Refactored class (without generics) - Emilio
* | 240f230 Refactored class (without generics) - Emilio
* | e9d07d5 Refactored class (without generics) - Emilio
* | 402fea5 Added new class related to the refactored ToolbarTools class
* | 3d38f29 Refactored ToolbarTools - Emilio
* | bc92433 Version 0.23.7.
* | a2f17d6 Version 0.23.7.
* | 438af03 Probably solved bug #3433815.
* | b09d1d9 Probably fixed bug #3431282.
* | 8d1e679 Probably fixed bug #3431283.
* | 3dc5b00 Corrected an ambiguous message at the startup of the software.
* | 0c87d75 Probably solved bug #3420581.
* | 0111205 Probably solved bug #3417076.
* | e66ee71 Version 0.23.7 delta, deactivated the stroke buffer in the class StrokeStyle. Suspected conflict with some graphic renderers.
* | 2cec8b8 Probably solved bug #3414721
* | 9cf1ebd Probably corrected bug #3127654.
* | 0ddb410 Updated to v. 0.23.6 the English user manual.
* | dd5589c Probably corrected bug #3409557.
* | d8b82ae Removed a few System.out.println here and there.
* | 396ed67 A suggestion of posta10100 has been implemented (the preferred size of CircuitPanel was negative in some cases).. Maybe this solves bug #3240342? In any case, it makes the code more robust.
* | dbadf4b I forgot tag 0.23.6, it should be there now, at last I hope I could tame svn...
* | 026c4d6 Corrected a bug which did not allow the FidoReadJ applet to run. Copied versions 0.23.5 and 0.23.6 in the tag directory of the repository.
* | 3d78b3d Version 0.23.6
* | 2037dbc Added german GUI translation, by Olaf Marzocchi. Corrected a misplaced item in a dialog and other details.
* | c7632f9 Implemented feature requests #3376505 and #3205202. Version 0.23.6 chi.
* | 72cd0c2 Updated the english electrical symbols library (thanks to DirtyDeeds. 0.23.6 eta.
* | 320e5bb Some code refactory and cleanup. Added the english version of the electrical symbol library. Corrected bug #3185176
* | 45f5b4b Export of a macro containing another macro now should work correctly.
* | 9a44372 Export of a splitted macro containing another macro which does not need to be splitted is not corrected perfectly but it works better. It remains to see why the exported macro is replicated 16 times.
* | 2085c73 Corrected a bug in the export of some vector formats: the PCB line was dashed in some conditions.
* | 24885e5 Corrected some details in the PGF export code (wrong line widths and size of the connections).
* | b1fd250 Some details corrected and improved.
* | 417aa90 Text in macros is not rotated correctly.
* | 39d6148 Corrected the shift of the drawing position during copy/paste when the splitting of the non standard macros is active.
* | 4fdde7a Corrected forground color on some list renderer when elements are selected.
* | 95e2205 Two new figures in the Italian manual.
* | 360fcf2 More update to the Italian user manual.
* | 5185942 Updated the Italian user manual to version 0.23.6.
* | 2b3af21 Corrected a few things thanks to the automatic tests.
* | 9cf7676 OpenFile and RunExport are now contained in files separated from FidoMain.java
* | 09ea383 Cleaner and more stable startup code for Swing.
* | 01a4703 A MapCoordinate object is now not contained anymore in the ParseSchem class.
* | f22896f Some modifications on the Undo system.
* | b158b1c A MapCoordinate object is now not contained anymore in the ParseSchem class.
* | 1988580 Some attention drawn towards a thread safe implementation of several classes. Creation of BasicStroke elements is now buffered between the different primitives.
* | 1ee0f5b The export does always center the image regardless of the origin of the drawing.
* | 99b9b17 Corrected a bug in the size determination of drawings when they contain at least a connection primitive.
* | 0c249d0 Export based on image size available for svg. Tests about image export updated.
* | a717e67 Translated the descriptions of the primitives' controls. Added some tests on consistency of language resources.
* | 6e31913 -n option now activates the headless mode.
* | eff01a7 Updated a few details.
* | f981c8b Reorganized the file export dialog. It allows to select a magnification factor for exporting towards vector formats.
* | de67654 Size magnification included in SCR exports.
* | 6a5cb1b Size magnification included in PGF exports. The corresponding automatic test include a short LaTeX document.
* | 8ffc2eb Automatic tests for exporting files. Size magnification implemented in EPS, PDF and SVN.
* | e2218fb Code for applying a magnification factor on vector file export. Done on ExportFCD.
* | fc8e200 Probably solved bug #3299281 in file export
* | 1c0457c Work on bug #3187161. A little cleaner code.
* | f8473ff Attenuated bug #3187161.
* | dce0297 Comments improved.
* | bd9a89c Compiling on systems other than MacOSX does not require to edit files. Remember to add the 'mac' option on the 'compile' and 'rebuild' scripts when compiling on MacOSX
* | 8f4beb4 Version 0.23.5
* | fad63be Version 0.23.5 eta RC1
* | bd5dbf7 Zoom to fit somewhat better.
* | 83fd689 Take account for a border for the size calculation in the pdf export filter.
* | d1765b3 Some details.
* | f5d5a61 Solved some problems while parsing SA PL PA commands. Extended features are disabled in strict FidoCad compatibility mode.
* | 9ebc687 Extended primitives with Name and Value are now saved and loaded. Version 0.23.5 epsilon
* | 7adca08 New extensions are saved in a somewhat backward-compatible format.
* | 80ee13a Export of the name and value text associated to the primitives. Improved some comments.
* | e75f259 Almost completed implementation of feature request #3076496. The result is interesting, but probably need some improvements.
* | ce740b6 Corrected an issue with the print dialog. Code refactoring.
* | bd49fc7 Code restructuring and some comments improved and updated.
* | df6e14d The confirm on exit dialog has been internationalized.
* | 5db2fe1 Implemented request #3123638. Version 0.23.5 gamma.
* | 2e9cbc6 Restored the Edit Layer button in the Layer dialog.
* | 3425ac0 Corrected a few bugs on vector format export.
* | 55127a6 Much better coordinate tracking for rotated text. Corrected a bug in the standard library. Almost solved bug #3127289.
* | 7f7fa0a First attempt to solve bug #3127289
* | b11ec4a Added a few comments.
* | 6a80744 Solved bug #3101041
* | 9783b8f Some refactoring.
* | 1e21e5a Refactored part of the copy/pasted code in the user interface setup for some dialogs.
* | 8b78ac3 Request #3076501 partially implemented: holding down Control key while inserting a rectangle forces to obtain a square.
* | 5864b20 Request #3076513 implemented: the order of the OK and Cancel buttons depends on the operating system.
* | e0010b1 Modified the About dialog to show line programDescription3 of the message bundles. Languages become separated from the country in the translations.
* | c2b00c7 Added user interface translation to spanish thanks to Androu1
* | f47beb7 Redraw is a little faster
* | e799173 Bug ID 3086081 solved.
* | 04ffae1 English manual updated to v. 0.23.4
* | 50c0984 French manual updated to v. 0.23.4
* | 5d1754d Italian manual upgraded to v. 0.23.4
* | d89b2bf Version 0.23.4
* | 8221379 Version 0.23.4
* | 9e67b13 Solved an issue with layer configuration when macro splitting is active
* | 66d5adb Encoding is forced to be UTF-8 on all platforms.
* | a2691cc Details about size calculation of drawings.
* | abf144c Right click ends also the  introduction of PCB lines.
* | c8681db Some comments upgraded.
* | b9a943e Adjusted a bug in the selection of primitives made of rectangles during a selection in a rectangular area. IHRAM library upgraded to 3.0
* | b9aa569 Improved the file extension consistency when exporting drawings
* | 567e9ee Corrected a bug for the multiple selection of elements using the control key
* | 2c5d8eb Corrected a bug in the size calculation for the circuit
* | 8426e6e Some corrections. Correct background in the search field
* | c2d76c9 Improved some comments and adjusted the license for some files.
* | 863c24b Worked on comments.
* | 1c0bc25 Code and comments formatting, details.
* | b519e81 Adjusted a few details in the README file.
* | db6dd46 Improved some comments.
* | bcb3474 Coding conventions described in README file.
* | 2167e4b Improved some comments.
* | 778c32c Corrected the bug for which the layer modification were not taken into account immediately.
* | f3c0485 Reviewed some code, improved comments.
* | 551ed3f Fixed some bugs in the code handling the text associated to the macros.
* | 7704bd9 Corrected another issue in the PGF export.
* | a6119c3 Corrected a few issues in the PGF export.
* | 73a0ca2 Adjusted a few comments in the code.
* | 2b72011 Corrected a detail in the PGF export.
* | 8bf0944 Adjusted the size of the exported graphics in the PGF export module.
* | 2672902 Make the layer list sensible to a double click (this avoids using the 'edit layer' button).
* | 2f40068 Defined some keys for the menus and other little tweaks.
* | e3ded6f Tweaked a little the About window.
* | 657ae8b Adjusted some small interface details.
* | f6cdb00 Tweaked a little the appearence of the dialog windows (in particular, adjusted the position and size of the Ok and Cancel buttons)
* | de868d3 Tweaked a little the appearence of the dialog windows (in particular, adjusted the position and size of the Ok and Cancel buttons)
* | 6d0de38 Corrected a graphical bug: multi layered macros were not drawn at all
* | 7b1c1e0 Adjusted a few things. Manual redraw of polygons (faster on my Mac, but it should be tested on other platforms).
* | d3e9b30 Corrected an issue with library loading  when opening a new program window.
* | bead0df Libraries can now be loaded and unloaded on the fly.
* | c74dde8 Faster, cleaner and clearer :-)
* | 480e724 Some code slightly restructured: smaller and easier to read
* | 5e3c59c Fixed a small issue: terminating primitive introduction with Escape now works as expected
* | 61aaf0e Eliminated all the remaining traces of the old XOR redraw code
* | 888085b Cleaner redraw code. Corrected a few bugs
* | 466415e Finally get rid of the hideous drawFast variant of the code
* | 840635d Old XOR code wiped out for Ellipse entry
* | 4b567d2 Old XOR code wiped out for Rectangle and Macro entry, some cleanings and better comments in some places
* | 77247da Solved a copy/paste bug
* | 828d1c4 Cleaner code, more comments, ruler font adjusted to Lucida Sans Regular.
* | 655e629 Slightly faster and cleaner redraw code.
* | 05425ca Transparency bug corrected. Redraw slightly faster.
* | 235480d Faster redraw. Corrected a few bugs
* | 5384afa Updated the manual in French language
* | 4624842 Updated the English manual to version 0.23.3
* | 65669d8 Adjusted a few details
* | 1158d4a Save linewidth config in files. Version 0.23.3
* | 76a7ca1 Corrected bug: (100,100) shift when macro called in macro
* | 67b3ddb Corrected bug: bad standard macro orientation when esporting and splitting nonstandard macros
* | 0c24ac1 Save/Load non default layer configuration
* | 2d123f9 Some comments added
* | c27ca3f Transparent layers
* | 7632fc8 Corrected a few things. Macro font size modification possible.
* | 4263288 Added other command line options
* | 04626f8 Implemented the -n, -c and -h command line options
* | 9ab2701 User can now change stroke width and the diameter of electrical connections
* | d5d4d4b Fixed an error in FidoReadJ. FidoCadJ can now be run as a trusted applet in a web page.
* | 027b68c I added a command line option: -d, which allows to specify the directory of the libraries to be loaded at startup
* | 84f6f1f Improved a little some comments
* | 9673fd0 Main update to FidoReadJ. It is automatically aligned to FidoCadJ each time it is compiled. IHRaM v. 2.1 library is included in the applet
* | f40e457 Comments added, slightly improve some code readability
* | 21847d3 Licenses adjusted to GPL v. 3, comments added
* | 32e8ed5 Comments added, code reorganization.
* | fbb8108 Added other comments.
* | b208fdc Mainly, added some comments.
* | 117c424 Adjusted svn:ignore on the manual generated files
* | 720015f Improved comments
* | fb7e586 Improved comments on a few files
* | 346ccb0 Upgraded the GPL version of some files. Improved a few comments
* | ce6b0bc Corrected a download link on it, en, fr manuals, upgraded fr manual to version 0.23.2
* | 86a172b Added comments and licensing
* | 3e097ab Added the ruler paragraph to the Italian manual
* | e386458 README file reformatted, added exclude_from_svn description. corrected a bug in the cleanall script (a file was missing)
* | 94166d5 Finally configured svn to ignore generated files
* | 4e7ca22 Playing again with svn:ignore
* | 2770311 Playing with svn:ignore
* | 78963f2 Trying to get rid of ignored files
* | 61727a4 Removed other generated files.
* | 8f0f083 Removed other generated files.
* | 000a6d9 Removed some generated files. Those should not be under the version control system.
* | 80eea73 English manual upgraded to v. 0.23.2
* | 29e2ef2 A few details added in the README file.
* | b3e6406 README file added. Unuseful scripts deleted.
* | 9f7de48 Code reorganization and small details.
* | 62750dd Code reorganization.
* | 5eb6665 Comments improved.
* | 6ef4abb Improved some docs, and Javadoc...
* | 426310c Updated the Javadoc documentation.
* | f8fd3c1 Migrated the remaining files to the GPL v. 3 license. Updated a few version comments.
* | 8e58c28 Migrated part of the files to the GPL v. 3 license.
* | 3a5cb7e Version 0.23.2 final. Hope it is ok!
* | b5892ae Version 0.23.2 epsilon. Other small details.
* | 382fcbf Version 0.23.2 epsilon. Just details.
* | 2f92279 Version 0.23.2 epsilon (not definitive). Bugs corrected.
* | c3f1d0f Version 0.23.2 epsilon (not definitive). A few refinements here and there.
* | f0150ac Version 0.23.2 delta. Hopefully, bugs shown in the 0.23.2 gamma version have been solved. Redraw is 2x faster for very big schematics with small features.
* | cb1a6d3 Version 0.23.2 gamma. Right click and drag in the selection mode in order to use a ruler. I hope it will be useful for PCB's.
* | b8f9be1 Version 0.23.2 beta. Upgrade of the javadoc results.
* | f981667 Version 0.23.2 beta (not definitive). Corrected a few things. Corrections on the French user manual.
* | 97e80b3 Version 0.23.2 beta (not definitive). Faster again!
* | df754a2 Version 0.23.2 beta (not definitive). The program is up to 2x faster when drawing schematics.
* | 440c8a8 Version 0.23.2 alpha. A lot of corrections done on the french manual
* | 4ebe688 Version 0.23.1 with updated manuals in Italian, French and English
* | bc49535 Version 0.23.1 alpha
* | 6e2b06a A few corrections on the Italian manual, version 0.23 of the French manual
* | e1a46d3 Source code of FidoCadJ 0.23a. I had to remove a clipping trick when selecting components in a square regions, singe on Windows there was an annoying graphig bug.
* | 1ea207a Source code of FidoCadJ 0.23.
* | 3341b8a Version 0.22.1 iota, allow splitting of non standard macros when copy/pasting as well as saving a drawing.
* | 8f1e2ab Version 0.22.1 eta, improved zoom to fit handling as well as some bugs with Open JRE
* | 5a4e44d Fixed a few bugs when resizing to fit, printing. Added the possibility of printing in landscape mode.
* | 1cc3990 Implemented the arrow and dash style combo boxes. This version is almost a release candidate.
* | e02968a Macro font export complete. A few bugs corrected.
* | c4f2f61 Further redraw increase, a few bug corrected
* | 8d3e9f7 Better layer selection when editing a primitive
* | f12c83e Font selection for advanced text as well for Macros, redraw speed increased.
* | c639ae6 0.22.1 gamma - Completed export in vectorial formats of new features (PGF, SVG, EPS, PDF)
* | 37332a6 0.22.1 gamma - Completed export in vectorial formats of new features (PGF, SVG, EPS, PDF)
* | 8ab0359 I forgot this directory in the previous commit...
* | 7eb1b8c This is 0.22.1 beta. Corrected a bug which prevented the execution on Windows systems. It still need a little bit of work in vector file exports (the new features are not exported yet).
* | 2d3344d Created documentation files with javadoc. Check the trunk/doc folder.
* | bfe8fa0 The version 0.22.1 is being born... Here are a few changes about the file organization, since I decided that with 60 classes it was the time to use packages. New features are the possibility of selecting a dashing style and arrows for lines and Bézier. Those features are not yet exported...
* | f2b4890 Added executable files
* | 3b8fc41 More complete and organized version
/ 
* 9bc783d First tryout for a website.


Questa è la famosa FF che sarebbe il merge di una commit cronologicamente successiva alla tua. E nel frattempo tu non hai lavorato ai file. O meglio: è mia responsabilità prendere la tua versione più recente prima di mandarti la mia commit.

Esatto, è quello che ho capito anch'io

La tua responsabilità, se vogliamo facilmente evitare guai, è quella di applicare solo merge ff.

Beh, se fosse possibile fare i merge cliccando su un bottone sul sito di GitHub, non nascondo che la cosa è molto comodosa Anche perché posso farlo da cellulare e non ho bisogno di avere un calcolatore ed un terminale Unix sottomano (che poi ho anche sul cellulare, ma vabbé...)

Però non so se sono merge ff, quando avrò tempo mi studierò la questione.

[Sjuanez]

Ovviamente il problema si presenta quando sono coinvolti gli stessi file.

Siccome Git ragiona per righe, se tu o io aggiungiamo una riga nel file ad un certo punto, si generano automaticamente molti conflitti. Il motivo è che tutte le righe dopo quella inserita sono "slittate". Questo rende antipatico anche individuare le reali modifiche al codice.

Se invece tu modifichi la riga 10 ad esempio e io la riga 25, ma senza aggiungere righe...git potrebbe fare tranquillamente il merge automatico all'interno dello stesso file. Credo che dal sito di GitHub ti faccia fare il merge automatico.

Ti toccherebbe controllare, da cellulare (!), il contenuto delle modifiche e visionare il diff...

Se scopri che tipo di merge ti fa fare dalla web app, fammelo sapere che son curioso.

[DarwinNE]

Ti toccherebbe controllare, da cellulare (!), il contenuto delle modifiche e visionare il diff...

Beh, quello lo faccio sempre! Non mi viene minimamente in mente di accettare una PR se non ho prima dato un'occhiata al diff, funziona molto bene anche da cellulare
Tra l'altro, diff riconosce molto bene se viene scalata una riga, non ci sono problemi per quello.

Se scopri che tipo di merge ti fa fare dalla web app, fammelo sapere che son curioso.

Ok, quando avrò tempo approfondirò la questione.

[Sjuanez]

Tra l'altro, diff riconosce molto bene se viene scalata una riga, non ci sono problemi per quello.

Anche io sto verificando questo aspetto, ma con "git diff" essendo un povero utente Windows.

Quello che mi lascia perplesso ancora, sono le volte in cui prendo una tua commit o confronto la mia commit con la repo ufficiale e vedo che tutte le righe in blocco sono state modificate secondo git.

Hai presente quando ti fa vedere un centinaio di righe modificate, ma tu avevi ritoccato solo una minuzia?

Mi ero dato la spiegazione che ho scritto prima. Se tu mi dici che non è così, la prossima volta bisognerà capire perché mi segna tutti quei cambiamenti. Che tra parentesi sono anche la ragione dei conflitti secondo me.

[DarwinNE]

Uh, non mi sembra che sia così, i conflitti che ho risolto manualmente, Git me li mostrava molto chiaramente con linee del tipo:

Codice: Seleziona tutto

<<<<<<<
pippo
=======
pluto
>>>>>>>

in cui pippo era la mia versione e pluto la tua (non ricordo esattamente).
Io per esempio vedevo che avevi ancora nei file dei link che avevo aggiornato successivamente al momento in cui tu hai fatto la tua fork. Da lì in poi, se non aggiorni la tua versione, i conflitti rimarranno...

[Sjuanez]

ok, questa sarebbe la normale situazione di un conflitto da risolvere manualmente.

a me, faceva tipo:

Codice: Seleziona tutto

- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
- Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice
+ Riga di codice


Ma questo senza che io avessi modificato tutte quelle righe. La mia modifica poteva coinvolgerne 2-3

Comunque ora ho un pochino più dimestichezza col programma, quindi non voglio perdermi a capire cosa sbagliavo. Anche perché tra repo locale e merge fatti online, potrei aver combinato la qualunque!

Direi che per il momento abbiamo risolto, mi finisco di studiare il software e torno a lavoro. Poi vedremo se questa pausa ha portato benefici.

[Sjuanez]

Eccomi con un altro piccolo dubbio. DarwinNE ti invoco qui piuttosto che scriverci in MP così magari anche altri sapranno aiutarci.

Con GIT le cose vanno molto meglio, ma ora che ho finito il pulsante per il sito e ho la branch pronta, non riesco a fare push. Ecco cosa mi capita:

Codice: Seleziona tutto

FidoCadJ_nuovo_sito\FidoCadJ [download_button]> git push -u origin gh-pages
remote: Permission to DarwinNE/FidoCadJ.git denied to MigthyThor.
fatal: unable to access 'https://github.com/DarwinNE/FidoCadJ.git/': The requested URL returned error: 403


So che devo fare qualcosa, ma non mi viene proprio in mente e ora non ho testa, magari hai (tu o altri) la soluzione pronta?

[DarwinNE]

Beh, è normale. Per il momento non hai write access al mio repository su GitHub.
Devi essere sicuro che il tuo su GitHub sia perfettamente sincronizzato con il mio, fare le modifiche in locale, fare un push sul tuo repository su GitHub e poi tramite GitHub mandarmi una pull request