Revision 95
| org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.app/org.gvsig.publish.app.mainplugin/src/main/resources-plugin/i18n/text.properties | ||
|---|---|---|
| 25 | 25 |
accept=Aceptar |
| 26 | 26 |
cancel=Cancelar |
| 27 | 27 |
|
| 28 |
layer_exists=Capa con mismo nombre en proyecto |
|
| 29 |
layer_exists3= ya contiene una capa con el nombre |
|
| 30 |
layer_exists2= ?Qu? hacer? |
|
| 28 | 31 |
file_exists3=El fichero existe actualmente. |
| 29 | 32 |
file_exists2=?Desea sobreescribirlo? |
| 30 | 33 |
|
| ... | ... | |
| 123 | 126 |
Operation_cancelled=Subida al servidor cancelada. |
| 124 | 127 |
Operation_cancelled2=Subida de datos al servidor cancelada por el usuario. |
| 125 | 128 |
remember_use_other_app=Recuerde que puede subir el proyecto generado en su equipo\nusando la otra aplicaci?n de publicaci?n. |
| 126 |
Directorio_base=Directorio de la cach? |
|
| 129 |
Directorio_base=Directorio de la cach? |
|
| 130 |
|
|
| 131 |
keep_previous=Mantener anterior |
|
| 132 |
update_to_new=Actualizar |
|
| 133 |
keep_both=Mantener ambos |
|
| 134 |
not_again=Aplicar a todos los casos |
|
| org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.app/org.gvsig.publish.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties | ||
|---|---|---|
| 24 | 24 |
accept=Accept |
| 25 | 25 |
cancel=Cancel |
| 26 | 26 |
|
| 27 |
layer_exists=Layer with the same name in the MapServer project |
|
| 28 |
layer_exists3= file contains a layer with the name |
|
| 29 |
layer_exists2= Choose an action. |
|
| 27 | 30 |
file_exists3=This file already exists. |
| 28 | 31 |
file_exists2=Overwrite it? |
| 29 | 32 |
|
| ... | ... | |
| 124 | 127 |
Operation_cancelled=Upload cancelled. |
| 125 | 128 |
Operation_cancelled2=Data upload cancelled by user. |
| 126 | 129 |
remember_use_other_app=Remember: you can upload the generated project\nusing the other publish tool. |
| 127 |
Directorio_base=Cache directory |
|
| 130 |
Directorio_base=Cache directory |
|
| 131 |
|
|
| 132 |
keep_previous=Keep previous |
|
| 133 |
update_to_new=Update |
|
| 134 |
keep_both=Keep both |
|
| 135 |
not_again=Apply the same to all coincidences |
|
| org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.mapserver/org.gvsig.publish.lib.impl.mapserver/src/main/java/org/gvsig/publish/impl/mapserver/utils/MapServer.java | ||
|---|---|---|
| 1 | 1 |
package org.gvsig.publish.impl.mapserver.utils; |
| 2 | 2 |
|
| 3 |
import java.awt.geom.Rectangle2D; |
|
| 4 | 3 |
import java.io.BufferedReader; |
| 5 | 4 |
import java.io.BufferedWriter; |
| 6 | 5 |
import java.io.File; |
| ... | ... | |
| 20 | 19 |
import java.util.List; |
| 21 | 20 |
|
| 22 | 21 |
import javax.activation.MimetypesFileTypeMap; |
| 22 |
import javax.swing.JCheckBox; |
|
| 23 |
import javax.swing.JOptionPane; |
|
| 23 | 24 |
import javax.xml.bind.JAXBContext; |
| 24 | 25 |
import javax.xml.bind.JAXBException; |
| 25 | 26 |
import javax.xml.bind.Marshaller; |
| ... | ... | |
| 411 | 412 |
}else{
|
| 412 | 413 |
// if(getPublishProperties().getJoinToCurrent()){
|
| 413 | 414 |
if(!isSplitByLayer){
|
| 415 |
/** Merge de las capas **/ |
|
| 416 |
|
|
| 417 |
|
|
| 418 |
|
|
| 419 |
/** Merge de los s?mbolos **/ |
|
| 414 | 420 |
SymbolSet newsymbolset = new SymbolSet(); |
| 415 | 421 |
newsymbolset = (SymbolSet) parserFile(getSymbolSetFile(), newsymbolset); |
| 416 | 422 |
SymbolSet auxsset = new SymbolSet(); |
| ... | ... | |
| 441 | 447 |
if(isAllInSameDocument){
|
| 442 | 448 |
map.getLayer().addAll(layerList); |
| 443 | 449 |
}else{
|
| 450 |
Map newmap = new Map(); |
|
| 451 |
newmap = (Map) parserFile(file, newmap); |
|
| 452 |
|
|
| 453 |
if(getPublishProperties().getJoinToCurrent()){
|
|
| 454 |
mergeLayerDefinition(file, newmap, layerList, PROJECT_MODE); |
|
| 455 |
} |
|
| 456 |
|
|
| 444 | 457 |
if(!isSplitByLayer){
|
| 445 | 458 |
File mapfile = createMapFile(file, MapServerUtils.getCurrentViewDocument().getName()); |
| 446 | 459 |
if(!layerList.isEmpty()){
|
| ... | ... | |
| 451 | 464 |
} |
| 452 | 465 |
//parserFile(map, file); |
| 453 | 466 |
} |
| 454 |
Map newmap = new Map(); |
|
| 455 |
newmap = (Map) parserFile(file, newmap); |
|
| 467 |
|
|
| 456 | 468 |
newmap.getInclude().addAll(map.getInclude()); |
| 457 | 469 |
parserFile(newmap, file); |
| 470 |
|
|
| 471 |
|
|
| 458 | 472 |
|
| 459 | 473 |
|
| 460 | 474 |
} |
| ... | ... | |
| 1862 | 1876 |
} |
| 1863 | 1877 |
return fontSetFile; |
| 1864 | 1878 |
} |
| 1879 |
|
|
| 1880 |
private void mergeLayerDefinition(File file2, Map map, List<Layer> layerList, int layerMode) {
|
|
| 1881 |
switch(layerMode){
|
|
| 1882 |
case LAYER_MODE: |
|
| 1883 |
// |
|
| 1865 | 1884 |
|
| 1885 |
break; |
|
| 1886 |
case PROJECT_MODE: |
|
| 1887 |
for(int i=0; i<map.getInclude().size(); i++){
|
|
| 1888 |
String auxPath = map.getInclude().get(i).replace("//", File.separator);
|
|
| 1889 |
File auxFile = new File(file2.getParentFile() |
|
| 1890 |
.getAbsolutePath() + File.separator + auxPath); |
|
| 1891 |
|
|
| 1892 |
LayerSet auxLayerSet = (LayerSet) parserFile(auxFile, new LayerSet()); |
|
| 1893 |
boolean auxLayersModified = false; |
|
| 1894 |
boolean dontShow = false; |
|
| 1895 |
int n = -1; |
|
| 1896 |
|
|
| 1897 |
for(int j=auxLayerSet.getLayer().size()-1; j>=0; j--){
|
|
| 1898 |
Layer auxLayer = auxLayerSet.getLayer().get(j); |
|
| 1899 |
for(int k=layerList.size()-1; k>=0; k--){
|
|
| 1900 |
Layer auxCurrentLayer = layerList.get(k); |
|
| 1901 |
if(auxLayer.getName().equals(auxCurrentLayer.getName())){
|
|
| 1902 |
if(!dontShow){
|
|
| 1903 |
PublishManager manager = getPublishProperties().getManager(); |
|
| 1904 |
Object[] options = {manager.getTranslation("keep_previous"), manager.getTranslation("update_to_new"),
|
|
| 1905 |
manager.getTranslation("keep_both")};
|
|
| 1906 |
|
|
| 1907 |
JCheckBox checkbox = new JCheckBox(manager.getTranslation("not_again"));
|
|
| 1908 |
String message = auxPath+" "+ |
|
| 1909 |
manager.getTranslation("layer_exists3")+
|
|
| 1910 |
" '"+ auxCurrentLayer.getName() +"'\n"+ |
|
| 1911 |
manager.getTranslation("layer_exists2");
|
|
| 1912 |
Object[] params = {message, checkbox};
|
|
| 1913 |
|
|
| 1914 |
n = JOptionPane.showOptionDialog(null, |
|
| 1915 |
params, |
|
| 1916 |
manager.getTranslation("layer_exists"),
|
|
| 1917 |
JOptionPane.YES_NO_OPTION, |
|
| 1918 |
JOptionPane.WARNING_MESSAGE, |
|
| 1919 |
null, |
|
| 1920 |
options, |
|
| 1921 |
options[0]); |
|
| 1922 |
|
|
| 1923 |
|
|
| 1924 |
dontShow = checkbox.isSelected(); |
|
| 1925 |
} |
|
| 1926 |
|
|
| 1927 |
if(n==0){
|
|
| 1928 |
layerList.remove(auxCurrentLayer); |
|
| 1929 |
} |
|
| 1930 |
|
|
| 1931 |
if(n==1){
|
|
| 1932 |
auxLayerSet.getLayer().remove(auxLayer); |
|
| 1933 |
auxLayersModified = true; |
|
| 1934 |
} |
|
| 1935 |
} |
|
| 1936 |
} |
|
| 1937 |
} |
|
| 1938 |
|
|
| 1939 |
if(auxLayersModified){
|
|
| 1940 |
parserFile(auxLayerSet, auxFile); |
|
| 1941 |
} |
|
| 1942 |
|
|
| 1943 |
} |
|
| 1944 |
break; |
|
| 1945 |
} |
|
| 1946 |
} |
|
| 1947 |
|
|
| 1866 | 1948 |
private void mergeSymbolSet(SymbolSet symbolSet, SymbolSet localSymbolSet, int layerMode) {
|
| 1867 | 1949 |
switch(layerMode){
|
| 1868 | 1950 |
case LAYER_MODE: |
| org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.mapserver/org.gvsig.publish.swing.impl.mapserver/src/main/java/org/gvsig/publish/swing/impl/mapserver/gui/properties/mapfile/MapserverLayerPropertiesPanel.java | ||
|---|---|---|
| 7 | 7 |
import java.awt.event.ActionEvent; |
| 8 | 8 |
import java.awt.event.ActionListener; |
| 9 | 9 |
import java.util.Iterator; |
| 10 |
import java.util.List; |
|
| 10 | 11 |
|
| 11 | 12 |
import javax.swing.ImageIcon; |
| 12 | 13 |
import javax.swing.JButton; |
| ... | ... | |
| 25 | 26 |
import javax.swing.tree.DefaultTreeModel; |
| 26 | 27 |
import javax.swing.tree.TreeSelectionModel; |
| 27 | 28 |
|
| 29 |
import org.apache.commons.lang.StringUtils; |
|
| 28 | 30 |
import org.gvsig.andami.PluginServices; |
| 29 | 31 |
import org.gvsig.app.ApplicationLocator; |
| 30 | 32 |
import org.gvsig.app.project.Project; |
| ... | ... | |
| 547 | 549 |
Object obj = view.getProperty(MAPSERVER_SYMBOL_PROPERTIES); |
| 548 | 550 |
if(obj != null && obj instanceof SymbolSet){
|
| 549 | 551 |
SymbolSet sset = (SymbolSet) obj; |
| 550 |
for(int i=0; i<sset.getSymbol().size(); i++){
|
|
| 551 |
if(sset.getSymbol().get(i).getName().equals(sm.getName())){
|
|
| 552 |
return sset.getSymbol().get(i); |
|
| 552 |
if(sset != null && |
|
| 553 |
sset.getSymbol() != null && |
|
| 554 |
sset.getSymbol() instanceof List){
|
|
| 555 |
for(int i=0; i<sset.getSymbol().size(); i++){
|
|
| 556 |
Symbol sbl = sset.getSymbol().get(i); |
|
| 557 |
if(sbl != null && sbl.getName() != null && sm.getName() != null && |
|
| 558 |
StringUtils.isBlank(sbl.getName()) && |
|
| 559 |
StringUtils.isBlank(sm.getName()) && |
|
| 560 |
sbl.getName().equals(sm.getName())){
|
|
| 561 |
return sset.getSymbol().get(i); |
|
| 562 |
} |
|
| 553 | 563 |
} |
| 554 | 564 |
} |
| 555 | 565 |
} |
| ... | ... | |
| 562 | 572 |
if(obj != null && obj instanceof SymbolSet){
|
| 563 | 573 |
SymbolSet sset = (SymbolSet) obj; |
| 564 | 574 |
boolean isUpdated = false; |
| 565 |
for(int i=0; i<sset.getSymbol().size(); i++){
|
|
| 566 |
if(sset.getSymbol().get(i).getName().equals(sm.getName())){
|
|
| 567 |
sset.getSymbol().set(i, sm); |
|
| 568 |
isUpdated = true; |
|
| 569 |
break; |
|
| 575 |
if(sset != null && |
|
| 576 |
sset.getSymbol() != null && |
|
| 577 |
sset.getSymbol() instanceof List){
|
|
| 578 |
for(int i=0; i<sset.getSymbol().size(); i++){
|
|
| 579 |
Symbol sbl = sset.getSymbol().get(i); |
|
| 580 |
if(sbl != null && sbl.getName() != null && sm.getName() != null && |
|
| 581 |
StringUtils.isBlank(sbl.getName()) && |
|
| 582 |
StringUtils.isBlank(sm.getName()) && |
|
| 583 |
sbl.getName().equals(sm.getName())){
|
|
| 584 |
sset.getSymbol().set(i, sm); |
|
| 585 |
isUpdated = true; |
|
| 586 |
break; |
|
| 587 |
} |
|
| 570 | 588 |
} |
| 571 | 589 |
} |
| 572 | 590 |
if(!isUpdated){
|
| org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.swing/org.gvsig.publish.swing.impl/src/main/java/org/gvsig/publish/swing/impl/gui/panels/JTinyOWSOptionsPanel.java | ||
|---|---|---|
| 27 | 27 |
|
| 28 | 28 |
private static final String NS_URI = "http://127.0.0.1/"; |
| 29 | 29 |
private static final String NS_PREFIX = "tinyows"; |
| 30 |
private static final String SCHEMA_DIR = "/usr/local/tinyows/schema/"; |
|
| 30 |
private static final String SCHEMA_DIR = "/usr/local/share/tinyows/schema/";
|
|
| 31 | 31 |
private static final String ONLINE_RESOURCE = "http://127.0.0.1/cgi-bin/tinyows"; |
| 32 | 32 |
|
| 33 | 33 |
private PublishSwingManager swingManager; |
| org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.swing/org.gvsig.publish.swing.impl/src/main/java/org/gvsig/publish/swing/impl/gui/panels/JMapProxyOptionsPanel.java | ||
|---|---|---|
| 21 | 21 |
* |
| 22 | 22 |
*/ |
| 23 | 23 |
private static final long serialVersionUID = -2009677952944890568L; |
| 24 |
|
|
| 24 |
private static final String BASE_CACHE = "./cache_data"; |
|
| 25 | 25 |
private PublishSwingManager swingManager; |
| 26 | 26 |
private JTextField jFileField; |
| 27 | 27 |
|
| ... | ... | |
| 37 | 37 |
private JTextField getJFileField(){
|
| 38 | 38 |
if(this.jFileField==null){
|
| 39 | 39 |
jFileField = new JTextField(); |
| 40 |
jFileField.setText(BASE_CACHE); |
|
| 40 | 41 |
} |
| 41 | 42 |
return this.jFileField; |
| 42 | 43 |
} |
| ... | ... | |
| 46 | 47 |
|
| 47 | 48 |
JPanel mainPanel = new JPanel(new BorderLayout()); |
| 48 | 49 |
mainPanel.setPreferredSize(new Dimension(440, 174)); |
| 49 |
mainPanel.add(new Label("Directorio_base"), BorderLayout.WEST);
|
|
| 50 |
mainPanel.add(new Label(swingManager.getTranslation("Directorio_base")), BorderLayout.WEST);
|
|
| 50 | 51 |
mainPanel.add(getJFileField(), BorderLayout.CENTER); |
| 51 | 52 |
|
| 52 | 53 |
add(mainPanel); |
Also available in: Unified diff