Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 8ccb98b8

Přidáno uživatelem Jan Havlíček před asi 4 roky(ů)

Slight changes

Zobrazit rozdíly:

.gitignore
1 1 
project/Deserializer/.classpath
2 2 
project/Deserializer/.classpath
3 3 
project/Deserializer/.classpath
4 
project/.vscode/launch.json
4 
project/.vscode/launch.json
5 
project/html.txt
6 
project/json.txt
7 
project/app.config
8 
project/Deserializer/.classpath
project/Deserializer/.classpath
8 8 
	</classpathentry>
9 9 
	<classpathentry kind="src" path="src"/>
10 10 
	<classpathentry kind="src" path="resources"/>
11 
<<<<<<< HEAD
12 11 
	<classpathentry kind="lib" path="C:/Program Files/Java/jre1.8.0_251/lib/plugin.jar"/>
13 12 
	<classpathentry kind="lib" path="E:/Projekty/Mine/ZSWI/2020/sw/project/Deserializer/libs/mysql-connector-java-8.0.19.jar"/>
14 13 
	<classpathentry kind="lib" path="E:/Projekty/Mine/ZSWI/2020/sw/project/Deserializer/libs/ojdbc8.jar"/>
15 
=======
16 
	<classpathentry kind="lib" path="C:/Program Files/Java/jre1.8.0_241/lib/plugin.jar"/>
17 
	<classpathentry kind="lib" path="D:/Michal/University/1/LS/ASWI/semestralky/Deserializer/aswi2020horky/project/Deserializer/libs/mysql-connector-java-8.0.19.jar"/>
18 
	<classpathentry kind="lib" path="D:/Michal/University/1/LS/ASWI/semestralky/Deserializer/aswi2020horky/project/Deserializer/libs/ojdbc8.jar"/>
19 
	<classpathentry kind="lib" path="D:/Michal/University/1/LS/ASWI/semestralky/Deserializer/aswi2020horky/project/Deserializer/libs/sqljdbc42.jar"/>
20 
>>>>>>> ba6528585ed86a6678e631f6ec951eca25e42769
21 14 
	<classpathentry kind="output" path="bin"/>
22 15 
</classpath>
project/Deserializer/src/Converter.java
141 141 

  		




  142
  142
  
    
		for (content cnt : cntnts) {


  		




  143
  143
  
    
			if (cnt != null) {


  		




  144
  
  
    
				// Parametrizovany toJson pomoci dictionary


  		




  145
  
  
    
				// Ciste HTML / Cisty JSON


  		




  146
  
  
    
				json.append(cnt.toJson("", null, false));


  		




  
  144
  
    
				json.append(cnt.toJson("", null, false)).append("\n");


  		




  147
  145
  
    
				html.append(cnt.toJson("", null, false));


  		




  148
  146
  
    
			}


  		




  149
  147
  
    
		}


  		












Také k dispozici:  Unified diff